]>
granicus.if.org Git - php/log
Dmitry Stogov [Tue, 23 Dec 2014 01:29:27 +0000 (04:29 +0300)]
Improved array_keys()
Dmitry Stogov [Mon, 22 Dec 2014 23:49:47 +0000 (02:49 +0300)]
Improved get_object_vars()
Dmitry Stogov [Mon, 22 Dec 2014 23:49:33 +0000 (02:49 +0300)]
Improved unserialize()
krakjoe [Mon, 22 Dec 2014 21:32:14 +0000 (21:32 +0000)]
remove 3.0 from excluded versions because limitation lifted by native-tls
Dmitry Stogov [Mon, 22 Dec 2014 16:04:29 +0000 (19:04 +0300)]
Removed useless checks
Xinchen Hui [Mon, 22 Dec 2014 15:48:10 +0000 (23:48 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 22 Dec 2014 15:39:32 +0000 (23:39 +0800)]
Fixed warning
Dmitry Stogov [Mon, 22 Dec 2014 13:44:39 +0000 (16:44 +0300)]
Don't count variadic argument in zend_func.common.num_args. This allows faster CALL/RETURN code.
Anatol Belski [Mon, 22 Dec 2014 10:28:13 +0000 (11:28 +0100)]
missed include for intptr_t/uintptr_t
Anatol Belski [Mon, 22 Dec 2014 09:34:44 +0000 (10:34 +0100)]
use cleaner tsrm_intptr_t/tsrm_uintptr_t typedef
Dmitry Stogov [Mon, 22 Dec 2014 09:31:00 +0000 (12:31 +0300)]
typo
Xinchen Hui [Mon, 22 Dec 2014 05:10:46 +0000 (00:10 -0500)]
Micro optimaztion (yeah, I know compiler supposed to do that)
Xinchen Hui [Mon, 22 Dec 2014 04:18:56 +0000 (23:18 -0500)]
Fixed segfault
Xinchen Hui [Mon, 22 Dec 2014 04:16:25 +0000 (23:16 -0500)]
Micro optimization
Xinchen Hui [Mon, 22 Dec 2014 03:35:25 +0000 (22:35 -0500)]
Micro optimizations
Xinchen Hui [Mon, 22 Dec 2014 02:53:32 +0000 (21:53 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Ferenc Kovacs [Sun, 21 Dec 2014 19:01:39 +0000 (20:01 +0100)]
fix zts build on mac/clang
Andrea Faulds [Sun, 14 Dec 2014 18:20:23 +0000 (18:20 +0000)]
Use "float" and "integer" in typehint and zpp errors
Andrea Faulds [Mon, 15 Dec 2014 02:26:00 +0000 (02:26 +0000)]
Unify HTTP status code maps
Andrea Faulds [Sun, 21 Dec 2014 03:08:29 +0000 (03:08 +0000)]
UPGRADING and NEWS cleanups
Dmitry Stogov [Sun, 21 Dec 2014 03:03:49 +0000 (03:03 +0000)]
Allow arrays with define(), to match const syntax support
Xinchen Hui [Sat, 20 Dec 2014 10:17:56 +0000 (05:17 -0500)]
Make it inline
Nikita Popov [Fri, 19 Dec 2014 20:51:05 +0000 (21:51 +0100)]
Merge branch 'PHP-5.6'
Conflicts:
ext/opcache/Optimizer/pass2.c
Nikita Popov [Fri, 19 Dec 2014 20:45:54 +0000 (21:45 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Fri, 19 Dec 2014 20:40:54 +0000 (21:40 +0100)]
Fix bug #67111
Loop variables need to be freed for both "break" and "continue".
I'm adding the test to Zend/ because it's good to have a test for
this even without opcache.
Dmitry Stogov [Fri, 19 Dec 2014 16:43:17 +0000 (19:43 +0300)]
Fixed memory leaks
Dmitry Stogov [Fri, 19 Dec 2014 15:20:55 +0000 (18:20 +0300)]
Avoid NULL pointer dereferencing
Dmitry Stogov [Fri, 19 Dec 2014 15:00:16 +0000 (18:00 +0300)]
Improved setlocale(). Eliminated locale comparison in ext/pcre if it's not necessary.
Dmitry Stogov [Fri, 19 Dec 2014 11:51:41 +0000 (14:51 +0300)]
Enabled JIT for preg_split(). Use better zend_hash_*() functions.
Dmitry Stogov [Fri, 19 Dec 2014 10:07:35 +0000 (13:07 +0300)]
don't sort array with single element
Dmitry Stogov [Fri, 19 Dec 2014 10:06:34 +0000 (13:06 +0300)]
Simplify condition
Anatol Belski [Fri, 19 Dec 2014 09:24:57 +0000 (10:24 +0100)]
fixed tests
Anatol Belski [Fri, 19 Dec 2014 06:17:30 +0000 (07:17 +0100)]
C89 compat
Dmitry Stogov [Fri, 19 Dec 2014 02:07:47 +0000 (05:07 +0300)]
Improves strtotime() function.
Dmitry Stogov [Fri, 19 Dec 2014 02:06:54 +0000 (05:06 +0300)]
Improved array_diff() function (use simple and more efficient algorithm).
Dmitry Stogov [Fri, 19 Dec 2014 02:05:30 +0000 (05:05 +0300)]
Improved chr() function. Use FAST_ZPP, use interned strings.
Andrea Faulds [Fri, 19 Dec 2014 01:06:46 +0000 (01:06 +0000)]
More UPGRADING, NEWS
Andrea Faulds [Fri, 19 Dec 2014 00:58:49 +0000 (00:58 +0000)]
UPGRADING for Unicode Codepoint Escape Syntax
Andrea Faulds [Fri, 19 Dec 2014 00:40:59 +0000 (00:40 +0000)]
Unicode Codepoint Escape Syntax
Nikita Popov [Sat, 6 Dec 2014 11:57:20 +0000 (12:57 +0100)]
Drop ZEND_PRINT opcode in favor of ZEND_ECHO
The return value long(1) is an IS_CONST operand now.
Anatol Belski [Thu, 18 Dec 2014 09:09:02 +0000 (10:09 +0100)]
Merge remote-tracking branch 'origin/native-tls'
Anatol Belski [Thu, 18 Dec 2014 08:09:02 +0000 (09:09 +0100)]
noted the TSRM changes to UPGRADING.INTERNALS
Anatol Belski [Wed, 17 Dec 2014 16:46:48 +0000 (17:46 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix integral constant overflow warning
Use HUGE PAGES for opcahce SHM, if available.
Anatol Belski [Wed, 17 Dec 2014 15:45:35 +0000 (16:45 +0100)]
fix integral constant overflow warning
as it's promoted to size_t when passed to ZEND_CALL_ARG
Dmitry Stogov [Wed, 17 Dec 2014 11:59:08 +0000 (14:59 +0300)]
Use HUGE PAGES for opcahce SHM, if available.
Anatol Belski [Wed, 17 Dec 2014 11:37:50 +0000 (12:37 +0100)]
integrated the static tsrmls cache into ext/skel
Anatol Belski [Wed, 17 Dec 2014 10:53:45 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Added EXPECTED(). Most functions have arguments.
Anatol Belski [Wed, 17 Dec 2014 10:38:46 +0000 (11:38 +0100)]
remove the thread ctx from curl
Anatol Belski [Wed, 17 Dec 2014 10:05:23 +0000 (11:05 +0100)]
remove unused ZTS macros
Anatol Belski [Wed, 17 Dec 2014 10:03:13 +0000 (11:03 +0100)]
remove TSRMLS_* occurence
Remi Collet [Wed, 17 Dec 2014 10:01:23 +0000 (11:01 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Remi Collet [Wed, 17 Dec 2014 10:00:52 +0000 (11:00 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Remi Collet [Wed, 17 Dec 2014 09:59:36 +0000 (10:59 +0100)]
Better fix for #68601 for perf
https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Anatol Belski [Wed, 17 Dec 2014 09:58:31 +0000 (10:58 +0100)]
enable static tsrmls cache in the embed SAPI
Anatol Belski [Wed, 17 Dec 2014 09:52:28 +0000 (10:52 +0100)]
get rid of TSRMLS_* in the embed SAPI
Dmitry Stogov [Wed, 17 Dec 2014 09:16:02 +0000 (12:16 +0300)]
Added EXPECTED(). Most functions have arguments.
Anatol Belski [Wed, 17 Dec 2014 04:29:36 +0000 (05:29 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix unserializer patch
move this entry to the correct version
add missing NEWS entry
add missing NEWS entry
Updated or skipped certain 32-bit tests
add NEWS entry for #68594
5.4.37
add more BC breaks
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Fix typo
Hash value must not zero?
Xinchen Hui [Wed, 17 Dec 2014 03:52:42 +0000 (11:52 +0800)]
Merge branch 'fix-typo' of https://github.com/gustavotemple/php-src
Xinchen Hui [Wed, 17 Dec 2014 03:52:19 +0000 (11:52 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Stanislav Malyshev [Wed, 17 Dec 2014 00:41:05 +0000 (16:41 -0800)]
fix unserializer patch
Ferenc Kovacs [Wed, 17 Dec 2014 01:18:43 +0000 (02:18 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move this entry to the correct version
Ferenc Kovacs [Wed, 17 Dec 2014 01:18:29 +0000 (02:18 +0100)]
move this entry to the correct version
Ferenc Kovacs [Wed, 17 Dec 2014 01:15:36 +0000 (02:15 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing NEWS entry
add missing NEWS entry
5.4.37
Ferenc Kovacs [Wed, 17 Dec 2014 01:14:25 +0000 (02:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add missing NEWS entry
add missing NEWS entry
5.4.37
Ferenc Kovacs [Wed, 17 Dec 2014 01:13:59 +0000 (02:13 +0100)]
add missing NEWS entry
Ferenc Kovacs [Wed, 17 Dec 2014 01:13:13 +0000 (02:13 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add missing NEWS entry
5.4.37
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 17 Dec 2014 01:10:36 +0000 (02:10 +0100)]
add missing NEWS entry
Andrea Faulds [Wed, 17 Dec 2014 01:07:39 +0000 (01:07 +0000)]
Merge branch 'zppFailOnOverflow'
* zppFailOnOverflow:
Updated or skipped certain 32-bit tests
Andrea Faulds [Wed, 17 Dec 2014 01:06:48 +0000 (01:06 +0000)]
Updated or skipped certain 32-bit tests
Ferenc Kovacs [Wed, 17 Dec 2014 01:00:12 +0000 (02:00 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS entry for #68594
Ferenc Kovacs [Wed, 17 Dec 2014 00:59:38 +0000 (01:59 +0100)]
add NEWS entry for #68594
Stanislav Malyshev [Tue, 16 Dec 2014 19:44:41 +0000 (11:44 -0800)]
5.4.37
Stanislav Malyshev [Tue, 16 Dec 2014 19:00:51 +0000 (11:00 -0800)]
add more BC breaks
Stanislav Malyshev [Tue, 16 Dec 2014 18:25:03 +0000 (10:25 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Stanislav Malyshev [Tue, 16 Dec 2014 18:19:32 +0000 (10:19 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
Stanislav Malyshev [Tue, 16 Dec 2014 18:18:07 +0000 (10:18 -0800)]
update news
Stanislav Malyshev [Tue, 16 Dec 2014 18:17:07 +0000 (10:17 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Stanislav Malyshev [Tue, 16 Dec 2014 18:16:31 +0000 (10:16 -0800)]
add CVE
Stanislav Malyshev [Fri, 12 Dec 2014 04:52:08 +0000 (20:52 -0800)]
add missing test file
Stanislav Malyshev [Fri, 12 Dec 2014 03:28:32 +0000 (19:28 -0800)]
Fix bug #68594 - Use after free vulnerability in unserialize()
Anatol Belski [Tue, 16 Dec 2014 16:13:47 +0000 (17:13 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Optimize argument passing handlers:
Fix pcre non-FAST_ZPP build
Conflicts:
Zend/zend_compile.c
Zend/zend_execute.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/pcre/php_pcre.c
Dmitry Stogov [Tue, 16 Dec 2014 15:40:52 +0000 (18:40 +0300)]
Optimize argument passing handlers:
- predcalculate offsets of passed argument and store it in opline->result.var for ZEND_SEND_*;
- don't update "number of passed arguments" op each ZEND_SEND_* opcode, store it on call frame creation
- Change ZEND_HANDLE_EXCEPTION to determine "number of passed arguments" in incomplete calls fefore freeing
Anatol Belski [Tue, 16 Dec 2014 13:52:35 +0000 (14:52 +0100)]
don't need this in nts mode
Andrea Faulds [Tue, 16 Dec 2014 12:45:41 +0000 (12:45 +0000)]
Fix pcre non-FAST_ZPP build
Anatol Belski [Tue, 16 Dec 2014 11:56:00 +0000 (12:56 +0100)]
various fixes for removing explicit tsrm_ls usage
Anatol Belski [Tue, 16 Dec 2014 11:22:27 +0000 (12:22 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
C89 fixes
use portable struct stat
fixed macro va args expansion for vs
Anatol Belski [Tue, 16 Dec 2014 11:20:29 +0000 (12:20 +0100)]
C89 fixes
Anatol Belski [Tue, 16 Dec 2014 10:46:06 +0000 (11:46 +0100)]
use portable struct stat
Anatol Belski [Tue, 16 Dec 2014 10:45:02 +0000 (11:45 +0100)]
fixed macro va args expansion for vs
Anatol Belski [Tue, 16 Dec 2014 09:44:43 +0000 (10:44 +0100)]
make the TSRM macros depend no the macroed cache name
Anatol Belski [Tue, 16 Dec 2014 09:21:05 +0000 (10:21 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix perm again...
cleanup uneeded cast
fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian)
Conflicts:
ext/phar/func_interceptors.c
ext/phar/phar_object.c
sapi/apache2handler/sapi_apache2.c
Anatol Belski [Tue, 16 Dec 2014 09:15:02 +0000 (10:15 +0100)]
reworked ini dtor
Remi Collet [Tue, 16 Dec 2014 09:13:58 +0000 (10:13 +0100)]
fix perm again...
Remi Collet [Tue, 16 Dec 2014 09:06:32 +0000 (10:06 +0100)]
cleanup uneeded cast
Remi Collet [Tue, 16 Dec 2014 08:31:20 +0000 (09:31 +0100)]
fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian)
Anatol Belski [Tue, 16 Dec 2014 08:12:09 +0000 (09:12 +0100)]
free the right globals
That's the same as in the previous commit. In the TS mode the tsrm
cache pointer might be unavailable or point to a wrong thread, so
the exact globals passed should be freed.
Anatol Belski [Tue, 16 Dec 2014 07:42:18 +0000 (08:42 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix perms
fix perms
PowerPC64 support in safe_address function
Remi Collet [Tue, 16 Dec 2014 07:38:51 +0000 (08:38 +0100)]
fix perms
Remi Collet [Tue, 16 Dec 2014 07:38:29 +0000 (08:38 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix perms
Remi Collet [Tue, 16 Dec 2014 07:37:56 +0000 (08:37 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix perms