]>
granicus.if.org Git - php/log
Xinchen Hui [Wed, 24 Dec 2014 13:16:17 +0000 (08:16 -0500)]
Use zend_string_tolower in zif_strtolower
Xinchen Hui [Wed, 24 Dec 2014 12:45:25 +0000 (07:45 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Wed, 24 Dec 2014 12:42:17 +0000 (20:42 +0800)]
No need to do this check for master, ZEND_COMPILE_NO_BUILTIN_STRLEN already cover it
Dmitry Stogov [Wed, 24 Dec 2014 12:34:52 +0000 (15:34 +0300)]
For disabled function, to disable arguments checks, we have to reset num_args and some related flags (in addition to arg_info)
Dmitry Stogov [Wed, 24 Dec 2014 12:04:51 +0000 (15:04 +0300)]
Added new API function 'zend_string* zend_string_tolower(zend_string*)'.
It simplifies code and avoids unnecessary allocation and copying if string is already in lower case.
Xinchen Hui [Wed, 24 Dec 2014 10:30:36 +0000 (18:30 +0800)]
Update NEWs
Xinchen Hui [Wed, 24 Dec 2014 10:30:06 +0000 (18:30 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/opcache/Optimizer/pass1_5.c
Xinchen Hui [Wed, 24 Dec 2014 09:55:58 +0000 (17:55 +0800)]
Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8 + Opcache)
Xinchen Hui [Tue, 23 Dec 2014 07:43:34 +0000 (02:43 -0500)]
FAST_ZPP for hot functions
Anatol Belski [Tue, 23 Dec 2014 16:33:30 +0000 (17:33 +0100)]
better fix for script encoding ini
Anatol Belski [Tue, 23 Dec 2014 16:02:45 +0000 (17:02 +0100)]
fix NULL deref when the script encoding wasn't previously set
Dmitry Stogov [Tue, 23 Dec 2014 16:08:28 +0000 (19:08 +0300)]
API for fast construction of packed arrays
K. [Tue, 23 Dec 2014 14:32:15 +0000 (15:32 +0100)]
zend_hash_do_resize: fix compacting condition
nNumUsed should always be greater or equal to nNumOfElements so original condition is never true and arrays are always doubled in size and compaction is never triggered
Anatol Belski [Tue, 23 Dec 2014 13:06:30 +0000 (14:06 +0100)]
throw error in configure.js when no 64-bit compiler detected
Anatol Belski [Tue, 23 Dec 2014 11:02:36 +0000 (12:02 +0100)]
improved system time function determination
It doesn't need to LoadLibrary and all that stuff every time, but
once on the first access. Also the functions which are not directly
used inlined now.
Anatol Belski [Tue, 23 Dec 2014 09:33:54 +0000 (10:33 +0100)]
cleanup
Dmitry Stogov [Tue, 23 Dec 2014 11:38:30 +0000 (14:38 +0300)]
Fixed possible crash (pcre cache must keep permanent strings)
Xinchen Hui [Tue, 23 Dec 2014 08:51:06 +0000 (03:51 -0500)]
Revert "Improve Hash foreach macros"
This reverts commit
95bb0a0f7aec46cacf6a447ded1688e6c6ff4b62 .
Xinchen Hui [Tue, 23 Dec 2014 05:50:39 +0000 (00:50 -0500)]
Improve Hash foreach macros
Xinchen Hui [Tue, 23 Dec 2014 03:59:17 +0000 (22:59 -0500)]
Please becareful with the tailed space after slash
Andrea Faulds [Tue, 23 Dec 2014 01:51:19 +0000 (01:51 +0000)]
share that hunk of code
Dmitry Stogov [Tue, 23 Dec 2014 01:29:41 +0000 (04:29 +0300)]
Improved trim/ltrim/rtrim functions.
Now php_trim() operates on zend_string and returns zend_string (it may return the same zend_string).
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