[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/php_zlib.h branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/php_zlib.h trunk/ext/zlib/zlib.c

2011-12-26 Thread Stanislav Malyshev 
stas Mon, 26 Dec 2011 08:29:11 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=321406

Log:
fix bug #60326 - restore ob_gzhandler

Bug: https://bugs.php.net/60326 (error getting bug information)
  
Changed paths:
U   php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h
U   php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
U   php/php-src/trunk/ext/zlib/php_zlib.h
U   php/php-src/trunk/ext/zlib/zlib.c

Modified: php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h
===
--- php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h	2011-12-26 05:08:09 UTC (rev 321405)
+++ php/php-src/branches/PHP_5_4/ext/zlib/php_zlib.h	2011-12-26 08:29:11 UTC (rev 321406)
@@ -13,7 +13,7 @@
| lice...@php.net so we can mail you a copy immediately.   |
+--+
| Authors: Rasmus Lerdorf ras...@lerdorf.on.ca   |
-   |  Stefan Röhrich s...@linux.de|
+   |  Stefan R�hrich s...@linux.de|
|  Michael Wallner m...@php.net  |
+--+
 */
@@ -34,14 +34,6 @@
 #define PHP_ZLIB_OUTPUT_HANDLER_NAME zlib output compression
 #define PHP_ZLIB_BUFFER_SIZE_GUESS(in_len) (((size_t) ((double) in_len * (double) 1.015)) + 10 + 8 + 4 + 1)

-ZEND_BEGIN_MODULE_GLOBALS(zlib)
-	/* variables for transparent gzip encoding */
-	int compression_coding;
-	long output_compression;
-	long output_compression_level;
-	char *output_handler;
-ZEND_END_MODULE_GLOBALS(zlib);
-
 typedef struct _php_zlib_buffer {
 	char *data;
 	char *aptr;
@@ -55,6 +47,15 @@
 	php_zlib_buffer buffer;
 } php_zlib_context;

+ZEND_BEGIN_MODULE_GLOBALS(zlib)
+	/* variables for transparent gzip encoding */
+	int compression_coding;
+	long output_compression;
+	long output_compression_level;
+	char *output_handler;
+	php_zlib_context *ob_gzhandler;
+ZEND_END_MODULE_GLOBALS(zlib);
+
 php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
 extern php_stream_ops php_stream_gzio_ops;
 extern php_stream_wrapper php_stream_gzip_wrapper;

Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c	2011-12-26 05:08:09 UTC (rev 321405)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c	2011-12-26 08:29:11 UTC (rev 321406)
@@ -13,7 +13,7 @@
| lice...@php.net so we can mail you a copy immediately.   |
+--+
| Authors: Rasmus Lerdorf ras...@lerdorf.on.ca   |
-   |  Stefan Röhrich s...@linux.de|
+   |  Stefan Röhrich s...@linux.de|
|  Zeev Suraski z...@zend.com|
|  Jade Nicoletti nicole...@nns.ch   |
|  Michael Wallner m...@php.net  |
@@ -84,30 +84,12 @@
 }
 /* }}} */

-/* {{{ php_zlib_output_handler() */
-static int php_zlib_output_handler(void **handler_context, php_output_context *output_context)
+/* {{{ php_zlib_output_handler_ex() */
+static int php_zlib_output_handler_ex(php_zlib_context *ctx, php_output_context *output_context)
 {
-	php_zlib_context *ctx = *(php_zlib_context **) handler_context;
 	int flags = Z_SYNC_FLUSH;
 	PHP_OUTPUT_TSRMLS(output_context);

-	if (!php_zlib_output_encoding(TSRMLS_C)) {
-		/* Vary: Accept-Encoding header sent along uncompressed content breaks caching in MSIE,
-			so let's just send it with successfully compressed content or unless the complete
-			buffer gets discarded, see http://bugs.php.net/40325;
-
-			Test as follows:
-			+Vary: $ HTTP_ACCEPT_ENCODING=gzip ./sapi/cgi/php '?php ob_start(ob_gzhandler); echo foo\n;'
-			+Vary: $ HTTP_ACCEPT_ENCODING= ./sapi/cgi/php '?php ob_start(ob_gzhandler); echo foo\n;'
-			-Vary: $ HTTP_ACCEPT_ENCODING=gzip ./sapi/cgi/php '?php ob_start(ob_gzhandler); echo foo\n; ob_end_clean();'
-			-Vary: $ HTTP_ACCEPT_ENCODING= ./sapi/cgi/php '?php ob_start(ob_gzhandler); echo foo\n; ob_end_clean();'
-		*/
-		if (output_context-op != (PHP_OUTPUT_HANDLER_START|PHP_OUTPUT_HANDLER_CLEAN|PHP_OUTPUT_HANDLER_FINAL)) {
-			sapi_add_header_ex(ZEND_STRL(Vary: Accept-Encoding), 1, 1 TSRMLS_CC);
-		}
-		return FAILURE;
-	}
-
 	if (output_context-op  PHP_OUTPUT_HANDLER_START) {
 		/* start up */
 		if (Z_OK != deflateInit2(ctx-Z, ZLIBG(output_compression_level), Z_DEFLATED, ZLIBG(compression_coding), MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY)) {
@@ -179,38 +161,86 @@
 return FAILURE;
 		}

-

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c

2011-12-26 Thread Pierre Joye 
pajoye   Mon, 26 Dec 2011 12:32:05 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=321411

Log:
- Fix bug #60326, fix TS build (introduced by r321406)

Bug: https://bugs.php.net/60326 (error getting bug information)
  
Changed paths:
U   php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
U   php/php-src/trunk/ext/zlib/zlib.c

Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-12-26 11:25:59 UTC 
(rev 321410)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2011-12-26 12:32:05 UTC 
(rev 321411)
@@ -432,7 +432,7 @@
 {
if (ZLIBG(ob_gzhandler)) {
deflateEnd((ZLIBG(ob_gzhandler)-Z));
-   php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler));
+   php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler) 
TSRMLS_CC);
ZLIBG(ob_gzhandler) = NULL;
}
 }

Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c   2011-12-26 11:25:59 UTC (rev 321410)
+++ php/php-src/trunk/ext/zlib/zlib.c   2011-12-26 12:32:05 UTC (rev 321411)
@@ -432,7 +432,7 @@
 {
if (ZLIBG(ob_gzhandler)) {
deflateEnd((ZLIBG(ob_gzhandler)-Z));
-   php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler));
+   php_zlib_output_handler_context_dtor(ZLIBG(ob_gzhandler) 
TSRMLS_CC);
ZLIBG(ob_gzhandler) = NULL;
}
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/zlib/ zlib.c

2011-12-26 Thread Stas Malyshev 

Hi!


was only present in 5.4 as far as I can tell, see Stas' commit yesterday.


Not sure what you mean as I did identical commits to both 5.4 and trunk. 
I also think it might be better to do it on RINIT, just in case.


--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/date/tests/ DateTime_add-fall-type2-type2.phpt

2011-12-26 Thread Daniel Convissor 
danielc  Tue, 27 Dec 2011 02:13:55 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=321419

Log:
One less xfail since Bug 55253 was fixed.

Bug: https://bugs.php.net/55253 (Closed) DateTime::add() and sub() result -1 
hour on objects with time zone type 2
  
Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type2.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type2.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type2.phpt  
2011-12-27 00:34:35 UTC (rev 321418)
+++ 
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type2.phpt  
2011-12-27 02:13:55 UTC (rev 321419)
@@ -2,8 +2,6 @@
 DateTime::add() -- fall type2 type2
 --CREDITS--
 Daniel Convissor dani...@php.net
---XFAIL--
-Various bugs exist
 --FILE--
 ?php

@@ -16,38 +14,38 @@
 test_time_fall_type2_prev_type2_prev: ADD: 2010-10-04 02:18:48 EDT + 
P+0Y1M2DT16H19M40S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type2_prev_type2_dt: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M0DT5H31M52S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type2_prev_type2_redodt: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M0DT6H34M5S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type2_prev_type2_redost: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M0DT7H36M16S = **2010-11-07 01:14:44 EST**
-test_time_fall_type2_prev_type2_st: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M0DT9H38M27S = **2010-11-07 03:16:55 EST**
-test_time_fall_type2_prev_type2_post: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EST**
+test_time_fall_type2_prev_type2_redost: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M0DT7H36M16S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type2_prev_type2_st: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M0DT9H38M27S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type2_prev_type2_post: ADD: 2010-11-06 18:38:28 EDT + 
P+0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EDT**
 test_time_fall_type2_dt_type2_prev: ADD: 2010-11-07 00:10:20 EDT + 
P-0Y0M0DT5H31M52S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type2_dt_type2_dt: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M0DT0H5M15S = **2010-11-07 00:15:35 EDT**
 test_time_fall_type2_dt_type2_redodt: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M0DT1H2M13S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type2_dt_type2_redost: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M0DT2H4M24S = **2010-11-07 01:14:44 EST**
-test_time_fall_type2_dt_type2_st: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M0DT4H6M35S = **2010-11-07 03:16:55 EST**
-test_time_fall_type2_dt_type2_post: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M1DT20H49M39S = **2010-11-08 19:59:59 EST**
+test_time_fall_type2_dt_type2_redost: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M0DT2H4M24S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type2_dt_type2_st: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M0DT4H6M35S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type2_dt_type2_post: ADD: 2010-11-07 00:10:20 EDT + 
P+0Y0M1DT20H49M39S = **2010-11-08 20:59:59 EDT**
 test_time_fall_type2_redodt_type2_prev: ADD: 2010-11-07 01:12:33 EDT + 
P-0Y0M0DT6H34M5S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type2_redodt_type2_dt: ADD: 2010-11-07 01:12:33 EDT + 
P-0Y0M0DT1H2M13S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type2_redodt_type2_redodt: ADD: 2010-11-07 01:12:33 EDT + 
P+0Y0M0DT0H3M2S = **2010-11-07 01:15:35 EDT**
-test_time_fall_type2_redodt_type2_redost: ADD: 2010-11-07 01:12:33 EDT + 
P+0Y0M0DT1H2M11S = **2010-11-07 01:14:44 EST**
-test_time_fall_type2_redodt_type2_st: ADD: 2010-11-07 01:12:33 EDT + 
P+0Y0M0DT3H4M22S = **2010-11-07 03:16:55 EST**
-test_time_fall_type2_redodt_type2_post: ADD: 2010-11-07 01:12:33 EDT + 
P+0Y0M1DT19H47M26S = **2010-11-08 19:59:59 EST**
-test_time_fall_type2_redost_type2_prev: ADD: 2010-11-07 01:14:44 EST + 
P-0Y0M0DT7H36M16S = **2010-11-06 18:38:28 EDT**
-test_time_fall_type2_redost_type2_dt: ADD: 2010-11-07 01:14:44 EST + 
P-0Y0M0DT2H4M24S = **2010-11-07 00:10:20 EDT**
-test_time_fall_type2_redost_type2_redodt: ADD: 2010-11-07 01:14:44 EST + 
P-0Y0M0DT1H2M11S = **2010-11-07 01:12:33 EDT**
+test_time_fall_type2_redodt_type2_redost: ADD: 2010-11-07 01:12:33 EDT + 
P+0Y0M0DT1H2M11S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type2_redodt_type2_st: ADD: 2010-11-07 01:12:33 EDT + 
P+0Y0M0DT3H4M22S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type2_redodt_type2_post: ADD: 2010-11-07 01:12:33 EDT + 
P+0Y0M1DT19H47M26S = **2010-11-08 20:59:59 EDT**
+test_time_fall_type2_redost_type2_prev: ADD: 2010-11-07 01:14:44 EST + 
P-0Y0M0DT7H36M16S = **2010-11-06 17:38:28 EST**
+test_time_fall_type2_redost_type2_dt: ADD: 2010-11-07 01:14:44 EST + 
P-0Y0M0DT2H4M24S = **2010-11-06 23:10:20 EST**
+test_time_fall_type2_redost_type2_redodt: ADD: 2010-11-07 01:14:44 EST + 
P-0Y0M0DT1H2M11S = **2010-11-07 00:12:33 EST**
 test_time_fall_type2_redost_type2_redost: ADD: 2010-11-07 01:14:44 EST +

[PHP-CVS] svn: /php/php-src/trunk/ext/zlib/ zlib.c

2011-12-26 Thread Pierre Joye 
pajoye   Tue, 27 Dec 2011 02:39:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=321420

Log:
- fix bug 60326, fix crash introduce by the fix

Bug: https://bugs.php.net/60326 (Assigned) ob_gzhander() removed
  
Changed paths:
U   php/php-src/trunk/ext/zlib/zlib.c

Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c   2011-12-27 02:13:55 UTC (rev 321419)
+++ php/php-src/trunk/ext/zlib/zlib.c   2011-12-27 02:39:14 UTC (rev 321420)
@@ -938,7 +938,7 @@
REGISTER_LONG_CONSTANT(ZLIB_ENCODING_GZIP, PHP_ZLIB_ENCODING_GZIP, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(ZLIB_ENCODING_DEFLATE, 
PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES();
-
+   ZLIBG(ob_gzhandler) = NULL;
return SUCCESS;
 }
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php