svn: /pear/pearweb/trunk/public_html/channels/ add.php

[email protected] ("Daniel O'Connor") Wed, 27 Apr 2011 15:07:02 +0000
Newsgroups php.pear.cvs,php.pear.core
Message-ID <[email protected]>
--b218a4540c5eb49f5e6f53459a92085f4e622b6b
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

clockwerx                                Wed, 27 Apr 2011 15:07:02 +0000

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

Log:
Bug #18484 Can't register some pear channels

Bug: http://pear.php.net/bugs/18484 (unknown) 
      
Changed paths:
    U   pear/pearweb/trunk/public_html/channels/add.php

Modified: pear/pearweb/trunk/public_html/channels/add.php
===================================================================
--- pear/pearweb/trunk/public_html/channels/add.php	2011-04-27 14:41:55 UTC (rev 310562)
+++ pear/pearweb/trunk/public_html/channels/add.php	2011-04-27 15:07:02 UTC (rev 310563)
@@ -97,8 +97,15 @@

     try {
         $req = new HTTP_Request2;
+        $dir = explode("/", $url->getPath());
+        if (!empty($dir)) {
+            array_pop($dir);
+        }
+        $dir[] = 'channel.xml';

-        $req->setURL($url->getScheme() . "://" . $url->getHost() . ":" . $url->getPort() . "/channel.xml");
+        $url->setPath(implode("/", $dir));
+
+        $req->setURL($url->getURL());
         channel::validate($req, $chan);

         if ($url->getHost() != $chan->getServer()) {

--b218a4540c5eb49f5e6f53459a92085f4e622b6b--