Changeset 5460

Timestamp:

05/12/2007 09:55:14 PM (18 years ago)

Author:

ryan

Message:

Return proper protocol. fixes #3886 for 2.3

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -932 +932 @@
     $text = get_status_header_desc( $header );
     
-    if ( empty( $text ) ) {
+    if ( empty( $text ) )
         return false;
-    } else {
-        if ( version_compare( phpversion(), '4.3.0', '>=' ) ) {
-            return @header( "HTTP/1.1 $header $text", true, $header );
-        } else {
-            return @header( "HTTP/1.1 $header $text" );
-        }
+
+    $protocol = $_SERVER["SERVER_PROTOCOL"];
+    if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) )
+        $protocol = 'HTTP/1.0';
+    $status_header = "$protocol $header $text";
+    $status_header = apply_filters('status_header', $status_header, $header, $text, $protocol);
+
+    if ( version_compare( phpversion(), '4.3.0', '>=' ) ) {
+        return @header( $status_header, true, $header );
+    } else {
+        return @header( $status_header );
     }
 }