Adam Harvey [Mon, 12 Nov 2012 12:04:26 +0000 (20:04 +0800)]
Update arginfo for preg_match_all() to reflect reality.
Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.
Antony Dovgal [Sun, 11 Nov 2012 18:37:04 +0000 (22:37 +0400)]
fix invalid read when trimming empty string
Felipe Pena [Fri, 9 Nov 2012 23:23:10 +0000 (21:23 -0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
Felipe Pena [Fri, 9 Nov 2012 23:22:27 +0000 (21:22 -0200)]
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
Johannes Schlüter [Wed, 7 Nov 2012 23:03:37 +0000 (00:03 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
configure.in
main/php_version.h
Johannes Schlüter [Wed, 7 Nov 2012 23:01:43 +0000 (00:01 +0100)]
This will be PHP 5.3.20
Stanislav Malyshev [Wed, 7 Nov 2012 09:18:34 +0000 (01:18 -0800)]
fix NEWS
Xinchen Hui [Wed, 7 Nov 2012 09:08:34 +0000 (17:08 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 7 Nov 2012 09:05:24 +0000 (17:05 +0800)]
Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
Xinchen Hui [Tue, 6 Nov 2012 06:14:55 +0000 (14:14 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Rasmus Lerdorf [Tue, 6 Nov 2012 05:06:18 +0000 (21:06 -0800)]
News entry for png memleak fix
Rasmus Lerdorf [Tue, 6 Nov 2012 05:04:33 +0000 (21:04 -0800)]
News entry for png memleak fix
Rasmus Lerdorf [Tue, 6 Nov 2012 04:58:04 +0000 (20:58 -0800)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Rasmus Lerdorf [Tue, 6 Nov 2012 04:56:19 +0000 (20:56 -0800)]
These need to be volatile in order to prevent leaking after the
longjmp in the error handler
Rasmus Lerdorf [Tue, 6 Nov 2012 04:56:19 +0000 (20:56 -0800)]
These need to be volatile in order to prevent leaking after the
longjmp in the error handler
Xinchen Hui [Fri, 2 Nov 2012 10:54:27 +0000 (18:54 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 2 Nov 2012 10:52:12 +0000 (18:52 +0800)]
Fixed bug #62444 (Handle leak in is_readable on windows).
Anatoliy Belsky [Wed, 31 Oct 2012 21:55:32 +0000 (22:55 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63241 PHP fails to open Windows deduplicated files.
Anatoliy Belsky [Wed, 31 Oct 2012 21:41:03 +0000 (22:41 +0100)]
Fixed bug #63241 PHP fails to open Windows deduplicated files.
Fix by (daniel dot stelter-gliese at innogames dot de).
No test is supplied because the issue addresses
the new feature of the Windows Server 2012 and
would need a very specific filesystem setup.
Andrey Hristov [Wed, 31 Oct 2012 17:29:31 +0000 (18:29 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Andrey Hristov [Wed, 31 Oct 2012 17:26:09 +0000 (18:26 +0100)]
read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem
Xinchen Hui [Wed, 31 Oct 2012 03:13:32 +0000 (11:13 +0800)]
Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)
David Soria Parra [Tue, 30 Oct 2012 14:43:32 +0000 (15:43 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
NEWS for bug #62593
Bug #62593 Updated to account for INOUT parameters
Bug #62593 Updated test to verify bindParam doesn't change original value
Bug #62593 Updated to always treat zval by value
Bug #62593 Added test for change
Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode
David Soria Parra [Tue, 30 Oct 2012 14:26:39 +0000 (15:26 +0100)]
NEWS for bug #62593
Will Fitch [Wed, 26 Sep 2012 16:00:17 +0000 (12:00 -0400)]
Bug #62593 Updated to account for INOUT parameters
Will Fitch [Tue, 25 Sep 2012 19:22:24 +0000 (15:22 -0400)]
Bug #62593 Updated test to verify bindParam doesn't change original value
Will Fitch [Tue, 25 Sep 2012 19:18:12 +0000 (15:18 -0400)]
Bug #62593 Updated to always treat zval by value
Will Fitch [Mon, 24 Sep 2012 17:31:20 +0000 (13:31 -0400)]
Bug #62593 Added test for change
Will Fitch [Thu, 20 Sep 2012 16:32:53 +0000 (12:32 -0400)]
Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode
Xinchen Hui [Tue, 30 Oct 2012 03:09:53 +0000 (11:09 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 30 Oct 2012 03:08:14 +0000 (11:08 +0800)]
Fixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak)
Simply change the expect parameter type, the valid of the resource will
be checked in using time.
Derick Rethans [Sat, 27 Oct 2012 14:19:55 +0000 (15:19 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sat, 27 Oct 2012 14:19:54 +0000 (15:19 +0100)]
- Updated to version 2012.8 (2012h)
Dmitry Stogov [Fri, 26 Oct 2012 16:47:30 +0000 (09:47 -0700)]
Fixed bug #63180 (Corruption of hash tables)
Antony Dovgal [Fri, 26 Oct 2012 12:36:47 +0000 (16:36 +0400)]
fix bug #63369
(un)serialize() leaves dangling pointers, causes crashes
Johannes Schlüter [Fri, 26 Oct 2012 12:22:31 +0000 (14:22 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/pdo_mysql/mysql_statement.c
ULF WENDEL [Fri, 26 Oct 2012 10:32:10 +0000 (12:32 +0200)]
This won't make the test pass but now its at least one that shows no unnecessary error messages...
Anthony Ferrara [Thu, 25 Oct 2012 20:04:56 +0000 (16:04 -0400)]
News entry for CURL notice addition
John Jawed (JJ) [Thu, 25 Oct 2012 04:47:47 +0000 (21:47 -0700)]
Notice if CURLOPT_SSL_VERIFYHOST is set to true
ULF WENDEL [Tue, 23 Oct 2012 13:13:57 +0000 (15:13 +0200)]
Fix for bug #62820
ULF WENDEL [Tue, 23 Oct 2012 12:58:16 +0000 (14:58 +0200)]
Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests
ULF WENDEL [Tue, 23 Oct 2012 11:16:12 +0000 (13:16 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
merged changes for bug #63297 from 5.3
fixed a typo in the error message
Fixed bug #63297 Phar fails to write an openssl based signature
enabled libxpm for gd on windows
enabled libxpm for gd on windows
Update test script
Test for #63336, xfail now
Fixed bug #63305 (zend_mm_heap corrupted with traits)
Anatoliy Belsky [Thu, 25 Oct 2012 07:40:21 +0000 (09:40 +0200)]
merged changes for bug #63297 from 5.3
Anatoliy Belsky [Thu, 25 Oct 2012 07:36:26 +0000 (09:36 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fixed a typo in the error message
Anatoliy Belsky [Thu, 25 Oct 2012 07:26:44 +0000 (09:26 +0200)]
fixed a typo in the error message
Anatoliy Belsky [Wed, 24 Oct 2012 12:46:28 +0000 (14:46 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63297 Phar fails to write an openssl based signature
Anatoliy Belsky [Wed, 24 Oct 2012 11:38:44 +0000 (13:38 +0200)]
Fixed bug #63297 Phar fails to write an openssl based signature
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
Anatoliy Belsky [Wed, 24 Oct 2012 08:36:52 +0000 (10:36 +0200)]
enabled libxpm for gd on windows
Anatoliy Belsky [Wed, 24 Oct 2012 08:35:07 +0000 (10:35 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
enabled libxpm for gd on windows
Anatoliy Belsky [Wed, 24 Oct 2012 08:26:27 +0000 (10:26 +0200)]
enabled libxpm for gd on windows
ULF WENDEL [Tue, 23 Oct 2012 11:15:46 +0000 (13:15 +0200)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
* 'PHP-5.3' of git.php.net:php-src:
fixed a typo in the error message
Fixed bug #63297 Phar fails to write an openssl based signature
enabled libxpm for gd on windows
Xinchen Hui [Tue, 23 Oct 2012 09:28:52 +0000 (17:28 +0800)]
Update test script
Xinchen Hui [Tue, 23 Oct 2012 08:35:56 +0000 (16:35 +0800)]
Test for #63336, xfail now
Xinchen Hui [Tue, 23 Oct 2012 03:34:25 +0000 (11:34 +0800)]
Fixed bug #63305 (zend_mm_heap corrupted with traits)
ULF WENDEL [Mon, 22 Oct 2012 11:38:02 +0000 (13:38 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (22 commits)
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
update NEWS
updated NEWS
Fixed bug #63284 PCRE upgrade to 8.31
preg indenpent test script for #63055
Update libmagic.patch
Add fix & missing fix
Add fix & missing fix
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
...
ULF WENDEL [Mon, 22 Oct 2012 11:37:37 +0000 (13:37 +0200)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
* 'PHP-5.3' of git.php.net:php-src: (123 commits)
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
updated NEWS
Fixed bug #63284 PCRE upgrade to 8.31
preg indenpent test script for #63055
Update libmagic.patch
Add fix & missing fix
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Remove executable permission on inc
Remove executable permission on phpt
Fixed bug #63236 (Executable permission on various source files)
...
Christopher Jones [Mon, 22 Oct 2012 05:21:46 +0000 (22:21 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
Christopher Jones [Mon, 22 Oct 2012 05:17:47 +0000 (22:17 -0700)]
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
The original fix broke Solaris installs of OCI8
Anatoliy Belsky [Fri, 19 Oct 2012 07:58:46 +0000 (09:58 +0200)]
update NEWS
Anatoliy Belsky [Fri, 19 Oct 2012 07:57:00 +0000 (09:57 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
updated NEWS
Anatoliy Belsky [Fri, 19 Oct 2012 07:56:02 +0000 (09:56 +0200)]
updated NEWS
Anatoliy Belsky [Fri, 19 Oct 2012 07:51:58 +0000 (09:51 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63284 PCRE upgrade to 8.31
Anatoliy Belsky [Fri, 19 Oct 2012 07:49:28 +0000 (09:49 +0200)]
Fixed bug #63284 PCRE upgrade to 8.31
Xinchen Hui [Fri, 19 Oct 2012 03:24:15 +0000 (11:24 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 19 Oct 2012 03:22:56 +0000 (11:22 +0800)]
preg indenpent test script for #63055
Xinchen Hui [Fri, 19 Oct 2012 03:15:03 +0000 (11:15 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 19 Oct 2012 03:14:14 +0000 (11:14 +0800)]
Update libmagic.patch
Christopher Jones [Fri, 19 Oct 2012 01:55:15 +0000 (18:55 -0700)]
Add fix & missing fix
Christopher Jones [Fri, 19 Oct 2012 01:51:40 +0000 (18:51 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Add fix & missing fix
Christopher Jones [Fri, 19 Oct 2012 01:50:18 +0000 (18:50 -0700)]
Add fix & missing fix
Christopher Jones [Fri, 19 Oct 2012 00:57:19 +0000 (17:57 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
Christopher Jones [Fri, 19 Oct 2012 00:53:00 +0000 (17:53 -0700)]
Fixed bug #63307 (Unused variable in oci8.c)
An output section for oci_internal_debug() was setting but not using a variable
Christopher Jones [Fri, 19 Oct 2012 00:37:49 +0000 (17:37 -0700)]
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: (22 commits)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Fixed bug #63248 Load multiple magic files on win
Cover have_ssl=NO and have_ssl=DISABLED
- BFN
- Fixed bug #63214 (Large PDO Firebird Queries)
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
...
Christopher Jones [Fri, 19 Oct 2012 00:37:21 +0000 (17:37 -0700)]
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src:
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Cover have_ssl=NO and have_ssl=DISABLED
Minor changes for MySQL 5.6
NEWS for
76601c4
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
Christopher Jones [Fri, 19 Oct 2012 00:33:51 +0000 (17:33 -0700)]
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
Improve high availability for explicitly terminated connections.
Derick Rethans [Thu, 18 Oct 2012 20:53:04 +0000 (21:53 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Thu, 18 Oct 2012 20:53:03 +0000 (21:53 +0100)]
- Updated to version 2012.7 (2012g)
Derick Rethans [Thu, 18 Oct 2012 16:53:55 +0000 (17:53 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
Zend/acinclude.m4
Derick Rethans [Thu, 18 Oct 2012 16:53:21 +0000 (17:53 +0100)]
SUpport newer bisons.
Xinchen Hui [Thu, 18 Oct 2012 15:32:48 +0000 (23:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 15:29:33 +0000 (23:29 +0800)]
Merge the fix for #61964 to 5.3, which will fix #63304
Xinchen Hui [Thu, 18 Oct 2012 12:13:36 +0000 (20:13 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 12:13:14 +0000 (20:13 +0800)]
indent
Xinchen Hui [Thu, 18 Oct 2012 12:11:32 +0000 (20:11 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 12:10:35 +0000 (20:10 +0800)]
better fix for #63055
Xinchen Hui [Thu, 18 Oct 2012 09:32:48 +0000 (17:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 09:31:27 +0000 (17:31 +0800)]
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
Xinchen Hui [Thu, 18 Oct 2012 08:33:07 +0000 (16:33 +0800)]
I forgot that inconsistent is only avaliable in debug mode
Xinchen Hui [Thu, 18 Oct 2012 08:06:20 +0000 (16:06 +0800)]
Add comments
Xinchen Hui [Thu, 18 Oct 2012 07:49:37 +0000 (15:49 +0800)]
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
This should also fixed various segfaults which the bt looks like cored in zval_mark_grey
Johannes Schlüter [Wed, 17 Oct 2012 16:26:27 +0000 (18:26 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 17 Oct 2012 16:25:40 +0000 (18:25 +0200)]
PHP 5.3.18 NEWS
Andrey Hristov [Wed, 17 Oct 2012 15:56:17 +0000 (17:56 +0200)]
fix NEWS
Andrey Hristov [Wed, 17 Oct 2012 15:23:37 +0000 (17:23 +0200)]
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
Andrey Hristov [Wed, 17 Oct 2012 15:22:31 +0000 (17:22 +0200)]
fix compilation failure on 32/64bit linux systems, when libmysql is used
with ext/mysql
Christopher Jones [Thu, 11 Oct 2012 00:28:35 +0000 (17:28 -0700)]
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:
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
Fix warnings preventing this test from passing
Remove executable permission on inc
Christopher Jones [Thu, 11 Oct 2012 00:28:31 +0000 (17:28 -0700)]
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src:
Remove executable permission on inc
Xinchen Hui [Wed, 10 Oct 2012 09:24:09 +0000 (17:24 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Wed, 10 Oct 2012 09:23:30 +0000 (17:23 +0800)]
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
Anatoliy Belsky [Wed, 10 Oct 2012 09:01:07 +0000 (11:01 +0200)]
Fix warnings preventing this test from passing
projects / php / log