ZF-11060

Backing out r23942 from Zend_Uri, not a valid fix


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23979 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Uri/Http.php

@@ -44,10 +44,10 @@ class Zend_Uri_Http extends Zend_Uri
      * Character classes for validation regular expressions
      */
     const CHAR_ALNUM    = 'A-Za-z0-9';
-    const CHAR_MARK     = '-_.!~*\'()\[\]|';
+    const CHAR_MARK     = '-_.!~*\'()\[\]';
     const CHAR_RESERVED = ';\/?:@&=+$,';
     const CHAR_SEGMENT  = ':@&=+$,;';
-    const CHAR_UNWISE   = '{}\\\\^`';
+    const CHAR_UNWISE   = '{}|\\\\^`';
 
     /**
      * HTTP username

tests/Zend/Uri/HttpTest.php

@@ -227,6 +227,7 @@ class Zend_Uri_HttpTest extends PHPUnit_Framework_TestCase
         $unwise = array(
             'http://example.com/?q={',
             'http://example.com/?q=}',
+            'http://example.com/?q=|',
             'http://example.com/?q=\\',
             'http://example.com/?q=^',
             'http://example.com/?q=`',
@@ -247,6 +248,7 @@ class Zend_Uri_HttpTest extends PHPUnit_Framework_TestCase
         $unwise = array(
             'http://example.com/?q={',
             'http://example.com/?q=}',
+            'http://example.com/?q=|',
             'http://example.com/?q=\\',
             'http://example.com/?q=^',
             'http://example.com/?q=`',
@@ -430,16 +432,6 @@ class Zend_Uri_HttpTest extends PHPUnit_Framework_TestCase
     }
     
     /**
-     * @group ZF-11060
-     */
-    public function testAcceptsPipeCharacterAsPartOfUri()
-    {
-        $uri = Zend_Uri_Http::fromString('http://www.example.com/map?apistyle=a|b|c');
-        $this->assertType('Zend_Uri_Http', $uri);
-        $this->assertEquals('apistyle=a|b|c', $uri->getQuery());
-    }
-    
-    /**
      * @group ZF-11188
      * @see http://www.ietf.org/rfc/rfc2732.txt
      */