Yasuo Ohgaki [Tue, 20 Aug 2013 08:48:24 +0000 (17:48 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: (27 commits)
bump version
Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]
Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]
Remove compile warning "variable ‘mekeylen’ set but not used"
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Update NEWS
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
Use in preg_replace_callback() using variables by reference and test for bug #64979
https://bugs.php.net/bug.php?id=64979
add CVE-2011-4718
...
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]
Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]
Remove compile warning "variable ‘mekeylen’ set but not used"
Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Remove compile warnings:
warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
Remove compile warnings:
variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
unused variable ‘last’ [-Wunused-variable]
unused variable ‘j’ [-Wunused-variable]
Adam Harvey [Mon, 19 Aug 2013 18:58:57 +0000 (11:58 -0700)]
Track created curl_slist structs by option so they can be updated in situ.
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.
This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
Use in preg_replace_callback() using variables by reference and test for bug #64979
https://bugs.php.net/bug.php?id=64979
add CVE-2011-4718
new for fix #65225
Fixed #65225: PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h
code related typo fixes
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
added new glob() test
fix using wrong buffer pointer
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
Fix for php bug #64802 includes test case
new for fix #65225
Fixed #65225: PHP_BINARY incorrectly set
Use pkg-config to detect iodbc
Add -P option to use the current binary
Create test to the extension xmlrpc
Fixbug: phpize --clean will delete include/*.h
Yasuo Ohgaki [Sun, 18 Aug 2013 03:29:36 +0000 (12:29 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: (30 commits)
Fix duplicated 5.5.2 NEWS in my tree
fix typo
merge news for 5.5.2
Update NEWS
Update NEWS
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
fix cve number
New news section
Prepare news for PHP-5.5.2
Reduce compiler noise by removing unused variables and labels
Fixed #65431 in zend_exception.c by Sixd
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Skip test if SKIP_ONLINE_TESTS set
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
removed unused vars
fixed strndup usage in the pgsql ext
use mysqlnd, some tests fail otherwise
ensure notices are not ignored when tests need them
...
* PHP-5.4:
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and
Linux are now used. DTrace is part of Oracle Linux. See
https://oss.oracle.com/projects/DTrace/
This patch does not change DTrace linking for non-Solaris/Linux
platforms.
For SystemTap users on Linux, this patch removes the compilation
warning:
Warning: Linking the shared library libphp5.la against the
non-libtool objects Zend/zend_dtrace.d.o is not portable!
projects / php / log