[PHP-CVS] com php-src: Bug 61610 adopted expected warnings for 5.4: ext/date/tests/date_default_timezone_get-1-win32.phpt
Commit:c7f9f54a2374847fe079c86ed07a90bc501f5660 Author:Anatoliy Belsky a...@php.net Tue, 24 Apr 2012 13:36:43 +0200 Parents: 485638a09c23e48820e0160c26098b0ef571c533 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7f9f54a2374847fe079c86ed07a90bc501f5660 Log: Bug 61610 adopted expected warnings for 5.4 Bugs: https://bugs.php.net/61610 Changed paths: M ext/date/tests/date_default_timezone_get-1-win32.phpt Diff: diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt index a12418f..ed9ac1a 100644 --- a/ext/date/tests/date_default_timezone_get-1-win32.phpt +++ b/ext/date/tests/date_default_timezone_get-1-win32.phpt @@ -17,8 +17,8 @@ date.timezone= parametrized so there is no hardcoded timezone data.*/ ? --EXPECTF-- -Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected '%s' for '%s' instead in %sdate_default_timezone_get-1-win32.php on line 3 +Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone '%s' for now, but please set date.timezone to select your timezone. in %s on line %d %s -Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected '%s' for '%s' instead in %sdate_default_timezone_get-1-win32.php on line 4 +Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone '%s' for now, but please set date.timezone to select your timezone. in %s on line %d %s -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only: ext/openssl/openssl.c
Commit:270a406ac94b5fc5cc9ef59fc61e3b4b95648a3e Author:Anatoliy Belsky a...@php.net Tue, 24 Apr 2012 14:05:35 +0200 Parents: 8d748e5de519867d9b6ce40e3ea28a209b07768f Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=270a406ac94b5fc5cc9ef59fc61e3b4b95648a3e Log: Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only Bugs: https://bugs.php.net/61413 Changed paths: M ext/openssl/openssl.c Diff: diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 7c5afc5..779a91d 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4677,7 +4677,7 @@ PHP_FUNCTION(openssl_encrypt) int data_len, method_len, password_len, iv_len = 0, max_iv_len; const EVP_CIPHER *cipher_type; EVP_CIPHER_CTX cipher_ctx; - int i, outlen, keylen; + int i = 0, outlen, keylen; unsigned char *outbuf, *key; zend_bool free_iv; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed bug #61820: ext/zlib/tests/bug61820.phpt ext/zlib/zlib.c
Commit:df00b64cb93dafbe5ae47bf733e826b54b32ae37
Author:Michael Wallner m...@php.net Tue, 24 Apr 2012 19:50:00
+0200
Parents: f21376d6688ef51d6d6764016f8a4c2e2fd57549
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=df00b64cb93dafbe5ae47bf733e826b54b32ae37
Log:
fixed bug #61820
using ob_gzhandler will complain about headers already sent
when no compression
the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
Bugs:
https://bugs.php.net/61820
Changed paths:
A ext/zlib/tests/bug61820.phpt
M ext/zlib/zlib.c
Diff:
diff --git a/ext/zlib/tests/bug61820.phpt b/ext/zlib/tests/bug61820.phpt
new file mode 100644
index 000..6f33b54
--- /dev/null
+++ b/ext/zlib/tests/bug61820.phpt
@@ -0,0 +1,23 @@
+--TEST--
+bug #61820 using ob_gzhandler will complain about headers already sent when no
compression
+--SKIPIF--
+?php
+extension_loaded(zlib) or die(skip);
+?
+--FILE--
+?php
+ob_start('ob_gzhandler');
+
+echo Hi there.\n;
+ob_flush();
+flush();
+
+echo This is confusing...\n;
+ob_flush();
+flush();
+?
+DONE
+--EXPECT--
+Hi there.
+This is confusing...
+DONE
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index d472573..545979d 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -187,7 +187,9 @@ static int php_zlib_output_handler(void **handler_context,
php_output_context *o
-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)) {
+ if ((output_context-op PHP_OUTPUT_HANDLER_START)
+ (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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/zlib/zlib.c
Commit:342b641a93355e9debea263b66accd5726d8ae04 Author:Michael Wallner m...@php.net Tue, 24 Apr 2012 19:52:45 +0200 Parents: 117207121cd8e98549fb260a9e1ba142f31c7d42 df00b64cb93dafbe5ae47bf733e826b54b32ae37 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=342b641a93355e9debea263b66accd5726d8ae04 Log: Merge branch 'PHP-5.4' Changed paths: MM ext/zlib/zlib.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix bug #61443: ext/zlib/tests/bug61443.phpt ext/zlib/zlib.c
Commit:7c93a16477d7e4d6e0386d0613558360f036d57b
Author:Michael Wallner m...@php.net Tue, 24 Apr 2012 20:35:49
+0200
Parents: df00b64cb93dafbe5ae47bf733e826b54b32ae37
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7c93a16477d7e4d6e0386d0613558360f036d57b
Log:
fix bug #61443
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly
the check for PHP_OUTPUT_WRITTEN was over-zealous
Bugs:
https://bugs.php.net/61443
Changed paths:
A ext/zlib/tests/bug61443.phpt
M ext/zlib/zlib.c
Diff:
diff --git a/ext/zlib/tests/bug61443.phpt b/ext/zlib/tests/bug61443.phpt
new file mode 100644
index 000..ea2fa68
--- /dev/null
+++ b/ext/zlib/tests/bug61443.phpt
@@ -0,0 +1,15 @@
+--TEST--
+bug #61443
+--SKIPIF--
+?php
+extension_loaded(zlib) or die(skip);
+?
+--FILE--
+?php
+ob_start(); echo foo\n; ob_get_clean();
+if(!headers_sent()) ini_set('zlib.output_compression', true); echo end\n;
+?
+DONE
+--EXPECTF--
+end
+DONE
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 545979d..f157821 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -884,9 +884,6 @@ static PHP_INI_MH(OnUpdate_zlib_output_compression)
if (status PHP_OUTPUT_SENT) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_WARNING,
Cannot change zlib.output_compression - headers already sent);
return FAILURE;
- } else if ((status PHP_OUTPUT_WRITTEN) int_value) {
- php_error_docref(ref.outcontrol TSRMLS_CC, E_WARNING,
Cannot enable zlib.output_compression - there has already been output);
- return FAILURE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: BFN: NEWS
Commit:52cb8ed314d5f4476547c6c7955ca96de900333a
Author:Michael Wallner m...@php.net Tue, 24 Apr 2012 20:40:19
+0200
Parents: 7c93a16477d7e4d6e0386d0613558360f036d57b
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=52cb8ed314d5f4476547c6c7955ca96de900333a
Log:
BFN
Changed paths:
M NEWS
Diff:
diff --git a/NEWS b/NEWS
index 3a4bc9a..94971ac 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP
NEWS
. Connection: close instead of Connection: closed (Gustavo)
- Core:
+ . Fixed bug #61820 (using ob_gzhandler will complain about headers already
+sent when no compression). (Mike)
. Fixed bug #61761 ('Overriding' a private static method with a different
signature causes crash). (Laruence)
. Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
@@ -20,6 +22,7 @@ PHP
NEWS
. Fixed bug #61650 (ini parser crashes when using ${} ini variables
(without apache2)). (Laruence)
. Fixed bug #61605 (header_remove() does not remove all headers). (Laruence)
+ . Fixed bug #61443 (can't change zlib.output_compression on the fly). (Mike)
. Fixed bug #61374 (html_entity_decode tries to decode code points that don't
exist in ISO-8859-1). (Gustavo)
. Fixed bug #61273 (call_user_func_array with more than 16333 arguments
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix NEWS order: NEWS
Commit:ac4d53cf70c3e50970a339b0920973aa0560b8ec
Author:Michael Wallner m...@php.net Tue, 24 Apr 2012 21:22:19
+0200
Parents: 52cb8ed314d5f4476547c6c7955ca96de900333a
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ac4d53cf70c3e50970a339b0920973aa0560b8ec
Log:
fix NEWS order
Changed paths:
M NEWS
Diff:
diff --git a/NEWS b/NEWS
index 94971ac..e314f26 100644
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,6 @@ PHP
NEWS
. Connection: close instead of Connection: closed (Gustavo)
- Core:
- . Fixed bug #61820 (using ob_gzhandler will complain about headers already
-sent when no compression). (Mike)
. Fixed bug #61761 ('Overriding' a private static method with a different
signature causes crash). (Laruence)
. Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
@@ -22,7 +20,6 @@ PHP
NEWS
. Fixed bug #61650 (ini parser crashes when using ${} ini variables
(without apache2)). (Laruence)
. Fixed bug #61605 (header_remove() does not remove all headers). (Laruence)
- . Fixed bug #61443 (can't change zlib.output_compression on the fly). (Mike)
. Fixed bug #61374 (html_entity_decode tries to decode code points that don't
exist in ISO-8859-1). (Gustavo)
. Fixed bug #61273 (call_user_func_array with more than 16333 arguments
@@ -149,6 +146,9 @@ PHP
NEWS
Popov)
- Zlib:
+ . Fixed bug #61820 (using ob_gzhandler will complain about headers already
+sent when no compression). (Mike)
+ . Fixed bug #61443 (can't change zlib.output_compression on the fly). (Mike)
. Fixed bug #61306 (initialization of global inappropriate for ZTS).
(Gustavo)
. Fixed bug #61287 (A particular string fails to decompress). (Mike)
. Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita
Popov)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: 5.4.1: NEWS configure.in main/php_version.h
Commit:02db9931c8ccbe7ab0b4adb9af44577c27213eeb Author:Stanislav Malyshev s...@php.net Tue, 24 Apr 2012 09:47:33 -0700 Parents: 07679e98d6f28a8a71e27ead479ae65a72c0d58d Branches: PHP-5.4.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=02db9931c8ccbe7ab0b4adb9af44577c27213eeb Log: 5.4.1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index d647f8d..5468348 100644 --- a/NEWS +++ b/NEWS @@ -1,14 +1,6 @@ PHPNEWS ||| -11 Apr 2012, PHP 5.4.1 RC2 - -- Core: - . Fixed crash in ZTS using same class in many threads. (Johannes) - -- fileinfo: - . Fix fileinfo test problems. (Anatoliy Belsky) - -29 Mar 2012, PHP 5.4.1 RC1 +26 Apr 2012, PHP 5.4.1 - CLI Server: . Fixed bug #61461 (missing checks around malloc() calls). (Ilia) @@ -17,6 +9,7 @@ PHP NEWS . Connection: close instead of Connection: closed (Gustavo) - Core: + . Fixed crash in ZTS using same class in many threads. (Johannes) . Fixed bug #61374 (html_entity_decode tries to decode code points that don't exist in ISO-8859-1). (Gustavo) . Fixed bug #61273 (call_user_func_array with more than 16333 arguments @@ -48,6 +41,9 @@ PHP NEWS function is by reference). (Nikita Popov) . Improve performance of set_exception_handler while doing reset (Laruence) +- fileinfo: + . Fix fileinfo test problems. (Anatoliy Belsky) + - FPM . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). (michaelhood at gmail dot com, Ilia) diff --git a/configure.in b/configure.in index b0cc63b..e081ae4 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=1 -PHP_EXTRA_VERSION=RC2 +PHP_EXTRA_VERSION= PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index a4d6048..585c84e 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION RC2 -#define PHP_VERSION 5.4.1RC2 +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.4.1 #define PHP_VERSION_ID 50401 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.3.11
Tag php-5.3.11 in php-src.git was created Tag: de18abd1b84c95d4119e03c12f2bf03cb672c988 Tagger: Johannes Schlüterjohan...@php.net Wed Apr 25 00:16:11 2012 +0200 Log: PHP 5.3.11 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPlyY5AAoJEH3sTmn8nIPXsWYH/3fClEyuAFHk+wn5M+WwL/U4 Sn/uTX40bwWuXbe2M9uxL7NfravfKfnZndtfdyuvC5a9aUr8k5/5e1jq5WiYp62+ SClHe6Sl4unI+waDAZsLBzpbouwQyT/lS6m7Sgvg3QACxCZy0OGkz6uH4FbpAEdl +MEYlELuhwEUkZSQO8D1x+WXqHbgFIj8/PURuiDTPIdvNkBIzKlPHhItxOksTcmt KkFhNlKSxkHa4OZIF12127szmnA/TzUrL/vh0XawHUJgzPQuFlfkBActC1AYL13e nMs5CshQH7DUGq8gc5OwZs4SUXmZ+zxcRcTs1e3meb+dGrfCU+YxZDuIXfwugok= =ifM0 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=de18abd1b84c95d4119e03c12f2bf03cb672c988 Target: 704bbb3263d0ec9a6b4a767bbc516e55388f4b0e Author: Johannes Schlüter johan...@php.net Wed, 25 Apr 2012 00:13:15 +0200 Parents: b9562b3085f4e856836779e07060ca8efddd21d0 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=704bbb3263d0ec9a6b4a767bbc516e55388f4b0e Target log: PHP 5.3.11 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.3.11: NEWS configure.in main/php_version.h
Commit:704bbb3263d0ec9a6b4a767bbc516e55388f4b0e
Author:Johannes Schlüter johan...@php.net Wed, 25 Apr 2012
00:13:15 +0200
Parents: b9562b3085f4e856836779e07060ca8efddd21d0
Branches: PHP-5.3.11
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=704bbb3263d0ec9a6b4a767bbc516e55388f4b0e
Log:
PHP 5.3.11
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index 5255db1..d26ffea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,25 +1,10 @@
PHPNEWS
|||
-12 Apr 2012, PHP 5.3.11RC2
+26 Apr 2012, PHP 5.3.11
- Core:
. Fixed bug #61650 (ini parser crashes when using ${} ini variables
(without apache2)). (Laruence)
-
-- Fileinfo
- . Upgraded libmagic to 5.11 (Pierre, Anatoliy)
- . Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
-directory descriptor under windows. (Anatoliy)
- . Fixed bug #61566 failure caused by the posix lseek and read versions
-under windows in cdf_read(). (Anatoliy)
-
-- pgsql:
- . Fixed bug #60718 (Compile problem with libpq (PostgreSQL 7.3 or less).
-(Yasuo Ohgaki)
-
-29 Mar 2012, PHP 5.3.11RC1
-
-- Core:
. Fixed bug #61273 (call_user_func_array with more than 16333 arguments
leaks / crashes). (Laruence)
. Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
@@ -66,6 +51,11 @@ PHP
NEWS
. Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
- Fileinfo
+ . Upgraded libmagic to 5.11 (Pierre, Anatoliy)
+ . Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
+directory descriptor under windows. (Anatoliy)
+ . Fixed bug #61566 failure caused by the posix lseek and read versions
+under windows in cdf_read(). (Anatoliy)
. Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo)
- Firebird Database extension (ibase):
@@ -94,6 +84,10 @@ PHP
NEWS
- PDO_Sqlite extension:
. Add createCollation support. (Damien)
+- pgsql:
+ . Fixed bug #60718 (Compile problem with libpq (PostgreSQL 7.3 or less).
+(Yasuo Ohgaki)
+
- Phar:
. Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
bytes). (Nikic)
diff --git a/configure.in b/configure.in
index a7d9440..a74771e 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
PHP_RELEASE_VERSION=11
-PHP_EXTRA_VERSION=RC2
+PHP_EXTRA_VERSION=
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \*
100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 2a85944..d3037da 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 3
#define PHP_RELEASE_VERSION 11
-#define PHP_EXTRA_VERSION RC2
-#define PHP_VERSION 5.3.11RC2
+#define PHP_EXTRA_VERSION
+#define PHP_VERSION 5.3.11
#define PHP_VERSION_ID 50311
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
