Fix IRI "normalization"

WordPress · Oct 29, 2014 · d93df96 · d93df96
1 parent b398534
commit d93df96
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/library/Requests/IRI.php b/library/Requests/IRI.php
@@ -115,11 +115,9 @@ class Requests_IRI
         ),
         'http' => array(
             'port' => 80,
-            'ipath' => '/'
         ),
         'https' => array(
             'port' => 443,
-            'ipath' => '/'
         ),
     );
 
@@ -743,6 +741,10 @@ protected function scheme_normalization()
         {
             $this->ipath = '';
         }
+        if (isset($this->ihost) && empty($this->ipath))
+        {
+            $this->ipath = '/';
+        }
         if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery'])
         {
             $this->iquery = null;
@@ -1060,7 +1062,6 @@ protected function set_path($ipath)
             $cache[$ipath] = array($valid, $removed);
             $this->ipath =  ($this->scheme !== null) ? $removed : $valid;
         }
-
         $this->scheme_normalization();
         return true;
     }