Optimize apache_response_headers (#496)

Author: stodorovic

wp-cache-phase2.php

@@ -196,17 +196,15 @@ function wp_cache_serve_cache_file() {
 
 // don't try to match modified dates if using dynamic code.
 if ( $wp_cache_mfunc_enabled == 0 && $wp_supercache_304 ) {
-if ( function_exists( 'apache_request_headers' ) ) {
-$request = apache_request_headers();
-$remote_mod_time = ( isset ( $request[ 'If-Modified-Since' ] ) ) ? $request[ 'If-Modified-Since' ] : null;
- } else {
-if ( isset( $_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ] ) )
-$remote_mod_time = $_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ];
-else
-$remote_mod_time = null;
+$headers = apache_request_headers();
+$remote_mod_time = isset ( $headers['If-Modified-Since'] ) ? $headers['If-Modified-Since'] : null;
+
+if ( is_null( $remote_mod_time ) && isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
+$remote_mod_time = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
  }
+
 $local_mod_time = gmdate("D, d M Y H:i:s",filemtime( $file )).' GMT';
-if ( !is_null($remote_mod_time) && $remote_mod_time == $local_mod_time ) {
+if ( !is_null($remote_mod_time) && $remote_mod_time == $local_mod_time ) {
 header( $_SERVER[ 'SERVER_PROTOCOL' ] . " 304 Not Modified" );
 exit();
  }
@@ -1355,15 +1353,21 @@ function wpcache_logged_in_message() {
 functionwp_cache_user_agent_is_rejected() {
 global$cache_rejected_user_agent;
 
-if (!function_exists('apache_request_headers')) returnfalse;
+if ( empty( $cache_rejected_user_agent ) || ! is_array( $cache_rejected_user_agent ) ) {
+returnfalse;
+ }
+
 $headers = apache_request_headers();
-if (!isset($headers["User-Agent"])) returnfalse;
-if ( false == is_array( $cache_rejected_user_agent ) )
+if ( empty( $headers['User-Agent'] ) ) {
 returnfalse;
-foreach ($cache_rejected_user_agentas$expr) {
-if (strlen($expr) > 0 && stristr($headers["User-Agent"], $expr))
+ }
+
+foreach ( $cache_rejected_user_agentas$user_agent ) {
+if ( ! empty( $user_agent ) && stristr( $headers['User-Agent'], $user_agent ) ) {
 returntrue;
+ }
  }
+
 returnfalse;
 }
 
@@ -3057,4 +3061,23 @@ function wp_cache_gc_watcher() {
  }
 }
 
-?>
+if ( ! function_exists( 'apache_request_headers' ) ) {
+/**
+ * A fallback for get request headers.
+ * Based on comments from http://php.net/manual/en/function.apache-request-headers.php
+ *
+ * @return array List of request headers
+ */
+functionapache_request_headers() {
+$headers = array();
+
+foreach ( array_keys( $_SERVER ) as$skey ) {
+if ( 0 === strncmp( $skey, 'HTTP_' ) ) {
+$header = implode( '-', array_map( 'ucfirst', array_slice( explode( '_', strtolower( $skey ) ) , 1 ) ) );
+$headers[ $header ] = $_SERVER[ $skey ];
+ }
+ }
+
+return$headers;
+ }
+}

wp-cache.php

@@ -1840,21 +1840,6 @@ function wp_cache_sanitize_value($text, & $array) {
 return$text;
 }
 
-// from tehjosh at gamingg dot net http://uk2.php.net/manual/en/function.apache-request-headers.php#73964
-// fixed bug in second substr()
-if( !function_exists('apache_request_headers') ) {
-functionapache_request_headers() {
-$headers = array();
-foreach(array_keys($_SERVER) as$skey) {
-if(substr($skey, 0, 5) == "HTTP_") {
-$headername = str_replace("", "-", ucwords(strtolower(str_replace("_", "", substr($skey, 5)))));
-$headers[$headername] = $_SERVER[$skey];
- }
- }
-return$headers;
- }
-}
-
 functionwp_cache_update_rejected_ua() {
 global$cache_rejected_user_agent, $wp_cache_config_file, $valid_nonce;