[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/win32/winutil.c branches/PHP_5_4/NEWS branches/PHP_5_4/win32/winutil.c trunk/win32/winutil.c
pajoye Fri, 27 Jan 2012 10:56:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322843
Log:
- fix #60895, possible invalid handler usage
Bug: https://bugs.php.net/60895 (Open) null pointer dereference in
php_win32_free_rng_lock()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/win32/winutil.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/win32/winutil.c
U php/php-src/trunk/win32/winutil.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2012-01-27 10:00:18 UTC (rev 322842)
+++ php/php-src/branches/PHP_5_3/NEWS 2012-01-27 10:56:33 UTC (rev 322843)
@@ -3,23 +3,25 @@
?? ?? 2012, PHP 5.3.10
- Core:
- . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
- (rui)
- . Fixed bug #60825 (Segfault when running symfony 2 tests).
- (Dmitry, Laruence)
+ . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
+(rui)
+ . Fixed bug #60825 (Segfault when running symfony 2 tests).
+(Dmitry, Laruence)
+ . Fix bug #60895 (Possible invalid handler usage in windows random
+functions). (Pierre)
- Firebird Database extension (ibase):
- . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
+ . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
- Streams:
- . Further fix for bug #60455 (stream_get_line misbehaves if EOF is not
detected
- together with the last read). (Gustavo)
- . Fixed bug #60817 (stream_get_line() reads from stream even when there is
- already sufficient data buffered). stream_get_line() now behaves more like
- fgets(), as is documented. (Gustavo)
+ . Further fix for bug #60455 (stream_get_line misbehaves if EOF is not
detected
+together with the last read). (Gustavo)
+ . Fixed bug #60817 (stream_get_line() reads from stream even when there is
+already sufficient data buffered). stream_get_line() now behaves more like
+fgets(), as is documented. (Gustavo)
- PHP-FPM SAPI:
- . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
+ . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
10 Jan 2012, PHP 5.3.9
Modified: php/php-src/branches/PHP_5_3/win32/winutil.c
===
--- php/php-src/branches/PHP_5_3/win32/winutil.c2012-01-27 10:00:18 UTC
(rev 322842)
+++ php/php-src/branches/PHP_5_3/win32/winutil.c2012-01-27 10:56:33 UTC
(rev 322843)
@@ -62,8 +62,10 @@
void php_win32_free_rng_lock()
{
tsrm_mutex_lock(php_lock_win32_cryptoctx);
- CryptReleaseContext(hCryptProv, 0);
- has_crypto_ctx = 0;
+ if (has_crypto_ctx == 1) {
+ CryptReleaseContext(hCryptProv, 0);
+ has_crypto_ctx = 0;
+ }
tsrm_mutex_unlock(php_lock_win32_cryptoctx);
tsrm_mutex_free(php_lock_win32_cryptoctx);
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2012-01-27 10:00:18 UTC (rev 322842)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-01-27 10:56:33 UTC (rev 322843)
@@ -1,9 +1,14 @@
PHPNEWS
|||
?? Jan 2012, PHP 5.4.0 RC 7
-- Fix possible attack in SSL sockets with SSL 3.0 / TLS 1.0.
- CVE-2011-3389. (Scott)
+- Core:
+ . Fix bug #60895 (Possible invalid handler usage in windows random
+functions). (Pierre)
+- OpenSSL:
+ . Fix possible attack in SSL sockets with SSL 3.0 / TLS 1.0.
+CVE-2011-3389. (Scott)
+
19 Jan 2012, PHP 5.4.0 RC6
- Core:
Modified: php/php-src/branches/PHP_5_4/win32/winutil.c
===
--- php/php-src/branches/PHP_5_4/win32/winutil.c2012-01-27 10:00:18 UTC
(rev 322842)
+++ php/php-src/branches/PHP_5_4/win32/winutil.c2012-01-27 10:56:33 UTC
(rev 322843)
@@ -62,8 +62,10 @@
void php_win32_free_rng_lock()
{
tsrm_mutex_lock(php_lock_win32_cryptoctx);
- CryptReleaseContext(hCryptProv, 0);
- has_crypto_ctx = 0;
+ if (has_crypto_ctx == 1) {
+ CryptReleaseContext(hCryptProv, 0);
+ has_crypto_ctx = 0;
+ }
tsrm_mutex_unlock(php_lock_win32_cryptoctx);
tsrm_mutex_free(php_lock_win32_cryptoctx);
Modified: php/php-src/trunk/win32/winutil.c
===
--- php/php-src/trunk/win32/winutil.c 2012-01-27 10:00:18 UTC (rev 322842)
+++ php/php-src/trunk/win32/winutil.c 2012-01-27 10:56:33 UTC (rev 322843)
@@ -62,8 +62,10 @@
void php_win32_free_rng_lock()
{
tsrm_mutex_lock(php_lock_win32_cryptoctx);
-
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Fri, 27 Jan 2012 13:27:03 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322845 Log: - update libs Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 11:10:56 UTC (rev 322844) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 13:27:03 UTC (rev 322845) @@ -1,3 +1,10 @@ +freetype-2.4.3 +icu-4.6.1 +jpeglib-6b libcurl-7.24.0 +libiconv-1.11 +libmcrypt-2.5.8 libpng-1.2.46 +libxml-2.7.7 openssl-0.9.8t + Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 11:10:56 UTC (rev 322844) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 13:27:03 UTC (rev 322845) @@ -1,3 +1,10 @@ +freetype-2.4.3 +icu-4.6.1 +jpeglib-6b libcurl-7.24.0 +libiconv-1.11 +libmcrypt-2.5.8 libpng-1.2.46 +libxml-2.7.7 openssl-0.9.8t +zlib-1.2.5 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 11:10:56 UTC (rev 322844) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 13:27:03 UTC (rev 322845) @@ -1,3 +1,10 @@ +freetype-2.4.3 +icu-4.6.1 +jpeglib-6b libcurl-7.24.0 +libiconv-1.11 +libmcrypt-2.5.8 libpng-1.2.46 +libxml-2.7.7 openssl-0.9.8t + -- 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_3/win32/build/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Fri, 27 Jan 2012 17:31:17 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322857 Log: - update libs Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:31:05 UTC (rev 322856) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) @@ -1,3 +1,5 @@ +bz2-1.0.6 +cclient-2007e freetype-2.4.3 icu-4.6.1 jpeglib-6b @@ -4,7 +6,11 @@ libcurl-7.24.0 libiconv-1.11 libmcrypt-2.5.8 +libmpir-1.3.1 libpng-1.2.46 +libpq-8.3.6 +libtidy-20090325 +libxslt-1.1.23 libxml-2.7.7 openssl-0.9.8t Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:31:05 UTC (rev 322856) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) @@ -1,3 +1,5 @@ +bz2-1.0.6 +cclient-2007e freetype-2.4.3 icu-4.6.1 jpeglib-6b @@ -4,7 +6,10 @@ libcurl-7.24.0 libiconv-1.11 libmcrypt-2.5.8 +libmpir-1.3.1 libpng-1.2.46 +libpq-8.3.6 +libtidy-20090325 +libxslt-1.1.23 libxml-2.7.7 openssl-0.9.8t -zlib-1.2.5 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:31:05 UTC (rev 322856) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) @@ -1,3 +1,5 @@ +bz2-1.0.6 +cclient-2007e freetype-2.4.3 icu-4.6.1 jpeglib-6b @@ -4,7 +6,10 @@ libcurl-7.24.0 libiconv-1.11 libmcrypt-2.5.8 +libmpir-1.3.1 libpng-1.2.46 +libpq-8.3.6 +libtidy-20090325 +libxslt-1.1.23 libxml-2.7.7 openssl-0.9.8t - -- 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_3/win32/build/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Fri, 27 Jan 2012 17:35:01 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322858 Log: - update libs Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2012-01-27 17:35:01 UTC (rev 322858) @@ -9,6 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 +libssh2-1.2.7 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2012-01-27 17:35:01 UTC (rev 322858) @@ -9,6 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 +libssh2-1.2.7 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:31:17 UTC (rev 322857) +++ php/php-src/trunk/win32/build/libs_version.txt 2012-01-27 17:35:01 UTC (rev 322858) @@ -9,6 +9,7 @@ libmpir-1.3.1 libpng-1.2.46 libpq-8.3.6 +libssh2-1.2.7 libtidy-20090325 libxslt-1.1.23 libxml-2.7.7 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
rasmus Sat, 28 Jan 2012 00:32:41 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322895 Log: karma for Shuhei Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2012-01-28 00:22:07 UTC (rev 322894) +++ SVNROOT/global_avail2012-01-28 00:32:41 UTC (rev 322895) @@ -354,6 +354,7 @@ avail|whereswardy|pecl/handlersocket,phpdoc avail|flavius|pecl/meta,phpdoc avail|osmanov|pecl/eio,phpdoc +avail|chobi|pecl/sundown,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/session/ mod_user.c tests/bug60860.phpt
felipe Sat, 28 Jan 2012 01:24:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322897
Log:
- Fixed bug #60860 (session.save_handler=user without defined function core
dumps)
Bug: https://bugs.php.net/60860 (Open) session.save_handler=user without
defined function core dumps
Changed paths:
U php/php-src/trunk/ext/session/mod_user.c
A php/php-src/trunk/ext/session/tests/bug60860.phpt
Modified: php/php-src/trunk/ext/session/mod_user.c
===
--- php/php-src/trunk/ext/session/mod_user.c2012-01-28 00:37:53 UTC (rev
322896)
+++ php/php-src/trunk/ext/session/mod_user.c2012-01-28 01:24:54 UTC (rev
322897)
@@ -80,6 +80,13 @@
{
zval *args[2];
STDVARS;
+
+ if (PSF(open) == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ user session functions not defined);
+
+ return FAILURE;
+ }
SESS_ZVAL_STRING((char*)save_path, args[0]);
SESS_ZVAL_STRING((char*)session_name, args[1]);
Added: php/php-src/trunk/ext/session/tests/bug60860.phpt
===
--- php/php-src/trunk/ext/session/tests/bug60860.phpt
(rev 0)
+++ php/php-src/trunk/ext/session/tests/bug60860.phpt 2012-01-28 01:24:54 UTC
(rev 322897)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #60860 (session.save_handler=user without defined function core dumps)
+--SKIPIF--
+?php include('skipif.inc'); ?
+--INI--
+session.save_handler=user
+--FILE--
+?php
+
+session_start();
+echo ok\n;
+
+?
+--EXPECTF--
+Warning: session_start(): user session functions not defined in %s on line 3
+
+Fatal error: session_start(): Failed to initialize storage module: user (path:
) in %s on line 3
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
