diff --git a/readme.txt b/readme.txt index a356974..50e403e 100644 --- a/readme.txt +++ b/readme.txt @@ -106,6 +106,7 @@ What's fixed: **Dropped functions** * there's no info log on/off anymore, it's triggered when WP_DEBUG is active +* sync protocols has been removed for two reasons: this has to be done by other systems and causes issues in special cases **For Devs** diff --git a/wp-ffpc-acache.php b/wp-ffpc-acache.php index 073f6c7..93a4774 100644 --- a/wp-ffpc-acache.php +++ b/wp-ffpc-acache.php @@ -289,30 +289,13 @@ function wp_ffpc_callback( $buffer ) { if ( get_option ( 'default_ping_status' ) == 'open' ) $meta['pingback'] = get_bloginfo('pingback_url'); - /* sync all http and https requests if enabled */ - if ( isset( $config['sync_protocols'] ) && $config['sync_protocols'] == '1' ) { - if ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) - $_SERVER['HTTPS'] = 'on'; - - if ( isset($_SERVER['HTTPS']) && ( ( strtolower($_SERVER['HTTPS']) == 'on' ) || ( $_SERVER['HTTPS'] == '1' ) ) ) { - $sync_from = 'http://' . $_SERVER['SERVER_NAME']; - $sync_to = 'https://' . $_SERVER['SERVER_NAME']; - } - else { - $sync_from = 'https://' . $_SERVER['SERVER_NAME']; - $sync_to = 'http://' . $_SERVER['SERVER_NAME']; - } - - $buffer = str_replace ( $sync_from, $sync_to, $buffer ); - } - /* add generation info is option is set, but only to HTML */ if ( $wp_ffpc_config['generate_time'] == '1' && stripos($buffer, '') ) { global $wp_ffpc_gentime; $mtime = explode ( " ", microtime() ); $wp_ffpc_gentime = ( $mtime[1] + $mtime[0] )- $wp_ffpc_gentime; - $insertion = "\n\n"; + $insertion = "\n\n"; $index = stripos( $buffer , '' ); $buffer = substr_replace( $buffer, $insertion, $index, 0); diff --git a/wp-ffpc-class.php b/wp-ffpc-class.php index e1ada75..474e660 100644 --- a/wp-ffpc-class.php +++ b/wp-ffpc-class.php @@ -533,14 +533,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) { tag.', $this->plugin_constant); ?> -
- -
-
- options['sync_protocols'],true); ?> /> - plugin_constant); ?> -
- diff --git a/wp-ffpc.php b/wp-ffpc.php index 166ad84..98d03b2 100644 --- a/wp-ffpc.php +++ b/wp-ffpc.php @@ -43,7 +43,6 @@ $wp_ffpc_defaults = array ( 'nocache_single' => false, 'nocache_page' => false, 'nocache_cookies' => false, - 'sync_protocols' => false, 'persistent' => false, 'response_header' => false, 'generate_time' => false,