]>
granicus.if.org Git - php/log
Bob Weinand [Wed, 11 Dec 2013 18:20:10 +0000 (19:20 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Added one more test for constant scalar expressions
Bob Weinand [Wed, 11 Dec 2013 18:17:07 +0000 (19:17 +0100)]
Added one more test for constant scalar expressions
Anatol Belski [Wed, 11 Dec 2013 13:16:22 +0000 (14:16 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
added missing prototype
Anatol Belski [Wed, 11 Dec 2013 13:16:07 +0000 (14:16 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added missing prototype
Anatol Belski [Wed, 11 Dec 2013 13:15:40 +0000 (14:15 +0100)]
added missing prototype
Anatol Belski [Wed, 11 Dec 2013 12:33:59 +0000 (13:33 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separator in cve-2013-6420 test
Anatol Belski [Wed, 11 Dec 2013 12:33:37 +0000 (13:33 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separator in cve-2013-6420 test
Anatol Belski [Wed, 11 Dec 2013 12:33:16 +0000 (13:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix dir separator in cve-2013-6420 test
Anatol Belski [Wed, 11 Dec 2013 12:32:49 +0000 (13:32 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix dir separator in cve-2013-6420 test
Anatol Belski [Wed, 11 Dec 2013 12:31:29 +0000 (13:31 +0100)]
fix dir separator in cve-2013-6420 test
Ard Biesheuvel [Wed, 11 Dec 2013 07:51:27 +0000 (08:51 +0100)]
Merge branch 'PHP-5.6'
Ard Biesheuvel [Wed, 11 Dec 2013 07:51:10 +0000 (08:51 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Ard Biesheuvel [Wed, 11 Dec 2013 07:50:53 +0000 (08:50 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Ard Biesheuvel [Tue, 10 Dec 2013 11:07:46 +0000 (12:07 +0100)]
Zend: fix overflow handling bug in non-x86 fast_add_function()
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
Stanislav Malyshev [Tue, 10 Dec 2013 19:36:33 +0000 (11:36 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Stanislav Malyshev [Tue, 10 Dec 2013 19:36:06 +0000 (11:36 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Stanislav Malyshev [Tue, 10 Dec 2013 19:35:26 +0000 (11:35 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Stanislav Malyshev [Tue, 10 Dec 2013 19:34:45 +0000 (11:34 -0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
Fixed Bug #66218 zend_register_functions breaks reflection
Stanislav Malyshev [Tue, 10 Dec 2013 19:33:40 +0000 (11:33 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 10 Dec 2013 19:32:11 +0000 (11:32 -0800)]
5.3.29-dev
Stanislav Malyshev [Sun, 8 Dec 2013 19:40:18 +0000 (11:40 -0800)]
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Remi Collet [Tue, 10 Dec 2013 15:10:48 +0000 (16:10 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fixed Bug #66218 zend_register_functions breaks reflection
Remi Collet [Tue, 10 Dec 2013 15:10:20 +0000 (16:10 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed Bug #66218 zend_register_functions breaks reflection
Remi Collet [Tue, 10 Dec 2013 15:10:02 +0000 (16:10 +0100)]
NEWS
Remi Collet [Tue, 10 Dec 2013 15:09:41 +0000 (16:09 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #66218 zend_register_functions breaks reflection
Remi Collet [Tue, 10 Dec 2013 15:07:16 +0000 (16:07 +0100)]
Fixed Bug #66218 zend_register_functions breaks reflection
Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.
Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title
Note:
- also affects functions overrided in extension
(should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
(instead of having a single bug list)
Dmitry Stogov [Tue, 10 Dec 2013 13:59:20 +0000 (17:59 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
Dmitry Stogov [Tue, 10 Dec 2013 13:58:22 +0000 (17:58 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
Conflicts:
NEWS
Dmitry Stogov [Tue, 10 Dec 2013 13:57:05 +0000 (17:57 +0400)]
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
Dmitry Stogov [Tue, 10 Dec 2013 13:05:23 +0000 (17:05 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
Dmitry Stogov [Tue, 10 Dec 2013 13:04:17 +0000 (17:04 +0400)]
Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
Dmitry Stogov [Tue, 10 Dec 2013 12:08:56 +0000 (16:08 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
Dmitry Stogov [Tue, 10 Dec 2013 12:08:46 +0000 (16:08 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
Dmitry Stogov [Tue, 10 Dec 2013 12:07:53 +0000 (16:07 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Dmitry Stogov [Tue, 10 Dec 2013 12:02:59 +0000 (16:02 +0400)]
Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
Dmitry Stogov [Tue, 10 Dec 2013 11:16:30 +0000 (15:16 +0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
Zend: fix overflow handling bug in non-x86 fast_add_function()
Dmitry Stogov [Tue, 10 Dec 2013 11:15:46 +0000 (15:15 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Zend: fix overflow handling bug in non-x86 fast_add_function()
Dmitry Stogov [Tue, 10 Dec 2013 11:15:11 +0000 (15:15 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed memory leaks introdused by: commit
611da37617749c81ab22b1e44a0cc1f294cc493a Author: Igor Wiedler <igor@wiedler.ch> Date: Sat Nov 9 13:48:23 2013 -0500
Dmitry Stogov [Tue, 10 Dec 2013 11:13:53 +0000 (15:13 +0400)]
Fixed memory leaks introdused by:
commit
611da37617749c81ab22b1e44a0cc1f294cc493a
Author: Igor Wiedler <igor@wiedler.ch>
Date: Sat Nov 9 13:48:23 2013 -0500
Ard Biesheuvel [Tue, 10 Dec 2013 11:12:44 +0000 (12:12 +0100)]
Merge branch 'PHP-5.6'
Ard Biesheuvel [Tue, 10 Dec 2013 11:07:46 +0000 (12:07 +0100)]
Zend: fix overflow handling bug in non-x86 fast_add_function()
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
Dmitry Stogov [Tue, 10 Dec 2013 10:21:38 +0000 (14:21 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class).
Dmitry Stogov [Tue, 10 Dec 2013 10:19:17 +0000 (14:19 +0400)]
Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class).
Dmitry Stogov [Tue, 10 Dec 2013 09:03:24 +0000 (13:03 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Arguments passed to user function have to be properly allocated on heap
Dmitry Stogov [Tue, 10 Dec 2013 09:03:09 +0000 (13:03 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Arguments passed to user function have to be properly allocated on heap
Dmitry Stogov [Tue, 10 Dec 2013 09:00:45 +0000 (13:00 +0400)]
Arguments passed to user function have to be properly allocated on heap
Ard Biesheuvel [Mon, 9 Dec 2013 16:04:05 +0000 (17:04 +0100)]
Merge branch 'PHP-5.6'
Ard Biesheuvel [Mon, 9 Dec 2013 15:54:42 +0000 (16:54 +0100)]
cli: don't cast away const in select() timeout argument
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]
Fix this by passing a stack copy of the timeout argument to select()
Stanislav Malyshev [Mon, 9 Dec 2013 00:26:34 +0000 (16:26 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Replace invalid code with a proper #error
Stanislav Malyshev [Sun, 8 Dec 2013 23:53:41 +0000 (15:53 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Replace invalid code with a proper #error
Stanislav Malyshev [Sun, 8 Dec 2013 23:50:08 +0000 (15:50 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Replace invalid code with a proper #error
Lior Kaplan [Fri, 4 Oct 2013 21:31:16 +0000 (23:31 +0200)]
Replace invalid code with a proper #error
This code creates a nasty error as mentioned in bugs #31131, #37062
Patch taken from Debian's PHP package: 044-strtod_arm_fix
Ferenc Kovacs [Fri, 6 Dec 2013 10:07:36 +0000 (11:07 +0100)]
Merge branch 'PHP-5.6'
Ferenc Kovacs [Fri, 6 Dec 2013 10:06:41 +0000 (11:06 +0100)]
Merge branch 'igorw-use-function' into PHP-5.6
Michael Wallner [Fri, 6 Dec 2013 09:39:18 +0000 (10:39 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
Michael Wallner [Fri, 6 Dec 2013 09:39:10 +0000 (10:39 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
BFN
Michael Wallner [Fri, 6 Dec 2013 09:39:02 +0000 (10:39 +0100)]
BFN
Michael Wallner [Fri, 6 Dec 2013 09:34:11 +0000 (10:34 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
Use 'user@example.com' rather than 'user@company.com' in tests
Michael Wallner [Fri, 6 Dec 2013 09:33:47 +0000 (10:33 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
Michael Wallner [Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
Michael Wallner [Fri, 6 Dec 2013 09:29:24 +0000 (10:29 +0100)]
Fixed bug #61645 (fopen and O_NONBLOCK)
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
Michael Wallner [Fri, 6 Dec 2013 09:27:33 +0000 (10:27 +0100)]
fix possibly uninitialized value
Ferenc Kovacs [Fri, 6 Dec 2013 04:39:49 +0000 (05:39 +0100)]
Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function
Sara Golemon [Wed, 4 Dec 2013 15:49:16 +0000 (07:49 -0800)]
Use 'user@example.com' rather than 'user@company.com' in tests
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
Michael Wallner [Thu, 5 Dec 2013 10:30:52 +0000 (11:30 +0100)]
BFN
Michael Wallner [Thu, 5 Dec 2013 10:27:26 +0000 (11:27 +0100)]
Merge branch 'dba'
* dba:
fix bug #62490
more test fixes
fix test
fix php_stream_copy_to_stream_ex usage
add missing clean section
remove test for already removed feature
Michael Wallner [Thu, 5 Dec 2013 10:04:25 +0000 (11:04 +0100)]
fix bug #62490
inifiles delete handler did not return false if the key was not found
Adam Harvey [Wed, 4 Dec 2013 22:29:13 +0000 (14:29 -0800)]
Renumber the comments in php_request_shutdown() to be in order.
What, me OCD?
Andrey Hristov [Wed, 4 Dec 2013 16:32:32 +0000 (18:32 +0200)]
Merge branch 'master' of git.php.net:php-src
Conflicts:
NEWS
Sara Golemon [Wed, 4 Dec 2013 15:50:45 +0000 (07:50 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Use 'user@example.com' rather than 'user@company.com' in tests
Sara Golemon [Wed, 4 Dec 2013 15:49:16 +0000 (07:49 -0800)]
Use 'user@example.com' rather than 'user@company.com' in tests
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
Andrey Hristov [Wed, 4 Dec 2013 14:20:03 +0000 (16:20 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
NEWS
UPGRADING
Andrey Hristov [Wed, 4 Dec 2013 10:39:11 +0000 (12:39 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Wed, 4 Dec 2013 10:06:59 +0000 (12:06 +0200)]
Fix loss of precision
Sara Golemon [Wed, 4 Dec 2013 02:21:40 +0000 (18:21 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix php_module_startup() when loading more than one additional module
Sara Golemon [Wed, 4 Dec 2013 02:21:12 +0000 (18:21 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix php_module_startup() when loading more than one additional module
Sara Golemon [Wed, 4 Dec 2013 00:36:07 +0000 (16:36 -0800)]
Fix php_module_startup() when loading more than one additional module
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).
Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.
Fixes 63159
Thanks to @a-j-k
Adam Harvey [Tue, 3 Dec 2013 22:54:24 +0000 (14:54 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
Adam Harvey [Tue, 3 Dec 2013 22:52:35 +0000 (14:52 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
Adam Harvey [Tue, 3 Dec 2013 22:51:03 +0000 (14:51 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
Adam Harvey [Tue, 3 Dec 2013 22:46:15 +0000 (14:46 -0800)]
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.
Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
Michael Wallner [Tue, 3 Dec 2013 17:18:40 +0000 (18:18 +0100)]
more test fixes
Michael Wallner [Tue, 3 Dec 2013 16:55:26 +0000 (17:55 +0100)]
fix test
Michael Wallner [Tue, 3 Dec 2013 16:55:18 +0000 (17:55 +0100)]
fix php_stream_copy_to_stream_ex usage
Michael Wallner [Tue, 3 Dec 2013 16:07:40 +0000 (17:07 +0100)]
add missing clean section
Michael Wallner [Tue, 3 Dec 2013 15:57:35 +0000 (16:57 +0100)]
remove test for already removed feature
Sebastian Bergmann [Tue, 3 Dec 2013 06:42:37 +0000 (07:42 +0100)]
Leftover: Bump version to 5.7.0
Nikita Popov [Mon, 2 Dec 2013 19:11:34 +0000 (20:11 +0100)]
Merge branch 'PHP-5.6'
Nikita Popov [Mon, 2 Dec 2013 19:10:08 +0000 (20:10 +0100)]
Support gmp_remroot() on GMP 4.1
Bob Weinand [Mon, 2 Dec 2013 17:39:01 +0000 (18:39 +0100)]
Added note about const scalar exprs in UPGRADING file
Michael Wallner [Mon, 2 Dec 2013 16:03:30 +0000 (17:03 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
Fix bug #65196
Michael Wallner [Mon, 2 Dec 2013 16:02:13 +0000 (17:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
BFN
Fix bug #65196
Michael Wallner [Mon, 2 Dec 2013 16:02:01 +0000 (17:02 +0100)]
BFN
Michael Wallner [Mon, 2 Dec 2013 16:01:25 +0000 (17:01 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65196
Michael Wallner [Mon, 2 Dec 2013 15:58:34 +0000 (16:58 +0100)]
Fix bug #65196
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
Michael Wallner [Mon, 2 Dec 2013 14:01:24 +0000 (15:01 +0100)]
Fix Bug #64776 The XSLT extension is not thread safe.
Michael Wallner [Mon, 2 Dec 2013 11:19:03 +0000 (12:19 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
fix bug #49634x
Michael Wallner [Mon, 2 Dec 2013 11:15:27 +0000 (12:15 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
BFN
fix bug #49634x
Michael Wallner [Mon, 2 Dec 2013 11:14:26 +0000 (12:14 +0100)]
BFN