Changeset 29853 for trunk/src/wp-includes/class-http.php

Timestamp:

10/08/2014 06:43:14 AM (11 years ago)

Author:

dd32

Message:

Avoid a PHP Notice when requesting a url without a path component (​http://example.com) in the Streams HTTP component.
Props barrykooij for inital patch; Fixes #27668

File:

• trunk/src/wp-includes/class-http.php (modified) (2 diffs)

trunk/src/wp-includes/class-http.php

@@ -862 +862 @@
         }
 
+        // Always pass a Path, defaulting to the root in cases such as http://example.com
+        if ( ! isset( $arrURL['path'] ) ) {
+            $arrURL['path'] = '/';
+        }
+
         if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
             if ( isset( $r['headers']['Host'] ) )
@@ -965 +970 @@
         else
             $requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
-
-        if ( empty($requestPath) )
-            $requestPath .= '/';
 
         $strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";