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

[Daniel O'Connor]

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()) {

[Daniel O'Connor]

clockwerx Wed, 27 Apr 2011 15:09:09 +0000

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

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

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 15:08:44 UTC (rev 310564)
+++ pear/pearweb/trunk/public_html/channels/add.php 2011-04-27 15:09:09 UTC (rev 310565)
@@ -108,11 +108,7 @@
$req->setURL($url->getURL());
channel::validate($req, $chan);

- if ($url->getHost() != $chan->getServer()) {
- throw new Exception("Channel server for wrong host");
- }

-
if (channel::exists($project_name->getValue())) {
throw new Exception("Already exists");
}