svn: /web/doc-editor/trunk/php/ SvnClient.php conf/project.pear.ini conf/project.php.ini

philip                                   Tue, 14 Jun 2011 18:49:52 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312162

Log:
Implemented SSL for php.net SVN (required now). Patch by Scott MacVicar.

Changed paths:
    U   web/doc-editor/trunk/php/SvnClient.php
    U   web/doc-editor/trunk/php/conf/project.pear.ini
    U   web/doc-editor/trunk/php/conf/project.php.ini

Modified: web/doc-editor/trunk/php/SvnClient.php
===================================================================
--- web/doc-editor/trunk/php/SvnClient.php	2011-06-14 18:47:22 UTC (rev 312161)
+++ web/doc-editor/trunk/php/SvnClient.php	2011-06-14 18:49:52 UTC (rev 312162)
@@ -153,6 +153,7 @@

         $host = $appConf[$project]['vcs.server.host'];
         $port = $appConf[$project]['vcs.server.port'];
+        $full_host = ($port == 443 ? 'ssl://' : '') . $host;
         $uri  = '/' . $appConf[$project]['vcs.server.repos'] . '!svn/act/'.$uuid;

         $ping = sprintf('MKACTIVITY %s HTTP/1.1
@@ -169,8 +170,8 @@

 ', $uri, $host);

-        $h = @fsockopen($host, $port);

+        $h = @fsockopen($full_host, $port);
         if( !$h ) { return 'svn.php.net seems to be down !'; }

         $matches = array();
@@ -213,7 +214,7 @@

 ', $uri, $host, $username, $data['realm'], $data['nonce'], $uri, $response, $data['cnonce'], $data['qop']);

-        $h = @fsockopen($host, $port);
+        $h = @fsockopen($full_host, $port);
         fwrite($h, $pong);
         $r = trim(fread($h, 2048));
         fclose($h);
@@ -243,9 +244,10 @@
         $port   = $appConf[$project]['vcs.server.port'];
         $uri    = $appConf[$project]['vcs.server.path'];
         $module = $appConf[$project]['vcs.module'];
+        $scheme = ($port == 443 ? 'https' : 'http');

         $cmd = 'cd '.$appConf['GLOBAL_CONFIGURATION']['data.path'].'; '
-              ."svn co http://$host:$port/$uri $module";
+              ."svn co $scheme://$host:$port/$uri $module";

         $err = 1;
         $trial_threshold = 3;

Modified: web/doc-editor/trunk/php/conf/project.pear.ini
===================================================================
--- web/doc-editor/trunk/php/conf/project.pear.ini	2011-06-14 18:47:22 UTC (rev 312161)
+++ web/doc-editor/trunk/php/conf/project.pear.ini	2011-06-14 18:49:52 UTC (rev 312162)
@@ -16,13 +16,13 @@
 vcs.server.host  = "svn.php.net"
 vcs.server.repos = "repository/"
 vcs.server.path  = "repository/pear/peardoc/trunk/"
-vcs.server.port  = 80
+vcs.server.port  = 443

 vcs.anon.login  =
 vcs.anon.passwd =

 vcs.module = "peardoc"
-vcs.karma.file = "http://svn.php.net/viewvc/SVNROOT/global_avail?view=co"
+vcs.karma.file = "https://svn.php.net/viewvc/SVNROOT/global_avail?view=co"

 vcs.path = "{GLOBAL_CONFIGURATION['data.path']}{PEAR['vcs.module']}/"
 vcs.configure.script.path = "{PEAR['vcs.path']}"

Modified: web/doc-editor/trunk/php/conf/project.php.ini
===================================================================
--- web/doc-editor/trunk/php/conf/project.php.ini	2011-06-14 18:47:22 UTC (rev 312161)
+++ web/doc-editor/trunk/php/conf/project.php.ini	2011-06-14 18:49:52 UTC (rev 312162)
@@ -17,13 +17,13 @@
 vcs.server.host  = "svn.php.net"
 vcs.server.repos = "repository/"
 vcs.server.path  = "repository/phpdoc/modules/doc-all/"
-vcs.server.port  = 80
+vcs.server.port  = 443

 vcs.anon.login  =
 vcs.anon.passwd =

 vcs.module = "phpdoc-all"
-vcs.karma.file = "http://svn.php.net/viewvc/SVNROOT/global_avail?view=co"
+vcs.karma.file = "https://svn.php.net/viewvc/SVNROOT/global_avail?view=co"

 vcs.path = "{GLOBAL_CONFIGURATION['data.path']}{PHP['vcs.module']}/"
 vcs.configure.script.path = "{PHP['vcs.path']}doc-base/"
@@ -49,4 +49,4 @@
 skeletons.folder = "{PHP['vcs.path']}{PHP['entities.folder']}/RFC/skeletons"

 preview.baseURI = "http://preview.php.net/"
-preview.baseURI.path = "/local/web/sites/preview.php.net/"
\ No newline at end of file
+preview.baseURI.path = "/local/web/sites/preview.php.net/"