]>
granicus.if.org Git - php/log
Joe Watkins [Fri, 2 Mar 2018 12:14:35 +0000 (13:14 +0100)]
add ability to show valgrind output with --show-mem
Xinchen Hui [Fri, 2 Mar 2018 02:32:15 +0000 (10:32 +0800)]
Combines common codes
Anatol Belski [Thu, 1 Mar 2018 19:52:09 +0000 (20:52 +0100)]
Get rid of casts
Anatol Belski [Thu, 1 Mar 2018 12:04:19 +0000 (13:04 +0100)]
Improve help message
Anatol Belski [Thu, 1 Mar 2018 11:15:20 +0000 (12:15 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Remove TSRMLS_*
Anatol Belski [Thu, 1 Mar 2018 11:12:11 +0000 (12:12 +0100)]
Remove TSRMLS_*
Xinchen Hui [Thu, 1 Mar 2018 10:34:39 +0000 (18:34 +0800)]
Attempt to fix build with gcc-4.8
Xinchen Hui [Thu, 1 Mar 2018 07:05:50 +0000 (15:05 +0800)]
Attempt to fix build again
seems if a cpu supports avx2 but not ssse3, the build will fail. but how
could that possible... :<
Xinchen Hui [Thu, 1 Mar 2018 03:22:26 +0000 (11:22 +0800)]
Attempt to fix build reported fails in containers
Joe Watkins [Wed, 28 Feb 2018 11:23:38 +0000 (12:23 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
fix news date
Joe Watkins [Wed, 28 Feb 2018 11:23:08 +0000 (12:23 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix news date
Joe Watkins [Wed, 28 Feb 2018 11:10:58 +0000 (12:10 +0100)]
fix news date
Dmitry Stogov [Wed, 28 Feb 2018 10:25:29 +0000 (13:25 +0300)]
Tunning for new GC_TYPE_INFO layout
Xinchen Hui [Wed, 28 Feb 2018 10:07:15 +0000 (18:07 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #76025 (Segfault while throwing exception in error_handler).
Xinchen Hui [Wed, 28 Feb 2018 10:07:05 +0000 (18:07 +0800)]
Update NEWS
Xinchen Hui [Wed, 28 Feb 2018 10:06:49 +0000 (18:06 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76025 (Segfault while throwing exception in error_handler).
Xinchen Hui [Wed, 28 Feb 2018 10:06:37 +0000 (18:06 +0800)]
Fixed bug #76025 (Segfault while throwing exception in error_handler).
Dmitry Stogov [Wed, 28 Feb 2018 07:16:51 +0000 (10:16 +0300)]
typo
George Wang [Wed, 28 Feb 2018 04:34:01 +0000 (23:34 -0500)]
Merge branch 'PHP-7.2'
George Wang [Wed, 28 Feb 2018 04:33:36 +0000 (23:33 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Wed, 28 Feb 2018 04:31:43 +0000 (23:31 -0500)]
revert last change, for PHP7 no need to do strlen() + 1 for hash look up.
George Wang [Wed, 28 Feb 2018 04:21:32 +0000 (23:21 -0500)]
Merge branch 'PHP-7.2'
George Wang [Wed, 28 Feb 2018 04:21:04 +0000 (23:21 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Wed, 28 Feb 2018 04:18:51 +0000 (23:18 -0500)]
[BUGFIX] calling php_ini_activate_per_host_config() with correct name length.
Bob Weinand [Wed, 28 Feb 2018 01:36:18 +0000 (02:36 +0100)]
Merge remote-tracking branch 'origin/PHP-7.2'
Bob Weinand [Wed, 28 Feb 2018 01:35:44 +0000 (02:35 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Wed, 28 Feb 2018 01:13:28 +0000 (02:13 +0100)]
Fix pcntl build on mac
Apparently on mac WIF*(x) macros resolve to (*(int*)&x) (_W_INT macro in sys/wait.h), forcing the value to be a lvalue
Bob Weinand [Wed, 28 Feb 2018 00:47:29 +0000 (01:47 +0100)]
Fixed build (extern php_stripslashes)
Dmitry Stogov [Tue, 27 Feb 2018 23:36:50 +0000 (02:36 +0300)]
Simplify GC_FLAGS cand CG_INFO checks
Ferenc Kovacs [Tue, 27 Feb 2018 23:08:14 +0000 (00:08 +0100)]
Merge branch 'PHP-7.2'
Ferenc Kovacs [Tue, 27 Feb 2018 23:05:10 +0000 (00:05 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 27 Feb 2018 23:02:48 +0000 (00:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 27 Feb 2018 23:00:12 +0000 (00:00 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 27 Feb 2018 22:57:06 +0000 (23:57 +0100)]
5.6.35 is next
Dmitry Stogov [Tue, 27 Feb 2018 21:53:30 +0000 (00:53 +0300)]
Change CG_TYPE_INFO() layout to provide more room for GC_INFO()
Dmitry Stogov [Tue, 27 Feb 2018 21:52:12 +0000 (00:52 +0300)]
Use macros to update specific parts of GC_TYPE_INFO() (direct assignments to GC_TYPE(), GC_FLAGS() and GC_INFO() are prohibited)
Anatol Belski [Tue, 27 Feb 2018 19:50:37 +0000 (20:50 +0100)]
Constify readonly var
George Wang [Tue, 27 Feb 2018 18:57:06 +0000 (13:57 -0500)]
Merge branch 'PHP-7.2'
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Tue, 27 Feb 2018 18:56:19 +0000 (13:56 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Tue, 27 Feb 2018 18:54:28 +0000 (13:54 -0500)]
release LiteSpeed SAPI 7.0.
add CRIU support.
add support for [PATH=] and [HOST=] sections in php.ini
Dmitry Stogov [Mon, 26 Feb 2018 09:49:58 +0000 (12:49 +0300)]
Completely hide GC implementation details into zend_gc.c
Christoph M. Becker [Tue, 27 Feb 2018 16:40:03 +0000 (17:40 +0100)]
Revert "[ci skip] Add missing return types to protos"
This reverts commit
a2c7c46d5ef5b9fc945d7b655d31d5c9f1a72d34 .
Since apparently there have been some mistakes in this commit, and it's
not clear yet how to solve them, we're reverting for now.
Dmitry Stogov [Tue, 27 Feb 2018 14:38:56 +0000 (17:38 +0300)]
Get rid of IS_OBJ_USE_GUARDS and IS_OBJ_HAS_GUARDS flags
Anatol Belski [Tue, 27 Feb 2018 10:51:40 +0000 (11:51 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
7.0.29 next
Anatol Belski [Tue, 27 Feb 2018 10:51:10 +0000 (11:51 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
7.0.29 next
Anatol Belski [Tue, 27 Feb 2018 10:50:22 +0000 (11:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
7.0.29 next
Anatol Belski [Tue, 27 Feb 2018 10:48:49 +0000 (11:48 +0100)]
7.0.29 next
Anatol Belski [Tue, 27 Feb 2018 10:40:11 +0000 (11:40 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:39:19 +0000 (11:39 +0100)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:38:23 +0000 (11:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:37:24 +0000 (11:37 +0100)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:34:13 +0000 (11:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:33:40 +0000 (11:33 +0100)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:32:26 +0000 (11:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:31:37 +0000 (11:31 +0100)]
[ci skip] Update NEWS
Stanislav Malyshev [Tue, 27 Feb 2018 06:27:02 +0000 (22:27 -0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 27 Feb 2018 06:26:55 +0000 (22:26 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 27 Feb 2018 06:26:50 +0000 (22:26 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 27 Feb 2018 06:26:26 +0000 (22:26 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 20 Feb 2018 23:34:43 +0000 (15:34 -0800)]
Fix bug #75981: prevent reading beyond buffer start
Xinchen Hui [Mon, 26 Feb 2018 08:54:53 +0000 (16:54 +0800)]
Avoding memory allocation
Xinchen Hui [Mon, 26 Feb 2018 08:48:49 +0000 (16:48 +0800)]
Avoding memory allocation
Xinchen Hui [Mon, 26 Feb 2018 06:52:45 +0000 (14:52 +0800)]
Avoding memory allocation if no translastion found
Christoph M. Becker [Sat, 24 Feb 2018 22:40:55 +0000 (23:40 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
Christoph M. Becker [Sat, 24 Feb 2018 22:38:37 +0000 (23:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Christoph M. Becker [Sat, 24 Feb 2018 22:37:43 +0000 (23:37 +0100)]
[ci skip] Update NEWS
Gabriel Caruso [Fri, 23 Feb 2018 23:40:31 +0000 (20:40 -0300)]
[ci skip] Remove space between function name and open parentheses
Gabriel Caruso [Fri, 23 Feb 2018 23:55:56 +0000 (20:55 -0300)]
[ci skip] Add missing return types to protos
Christoph M. Becker [Sat, 24 Feb 2018 10:33:13 +0000 (11:33 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix imagesetinterpolation arginfo
Christoph M. Becker [Sat, 24 Feb 2018 10:31:22 +0000 (11:31 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix imagesetinterpolation arginfo
Gabriel Caruso [Sat, 24 Feb 2018 00:33:03 +0000 (21:33 -0300)]
Fix imagesetinterpolation arginfo
imagesetinterpolation only requires one parameter.
Stanislav Malyshev [Sat, 24 Feb 2018 01:58:06 +0000 (17:58 -0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Set FPM maintainership
Stanislav Malyshev [Sat, 24 Feb 2018 01:57:57 +0000 (17:57 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Set FPM maintainership
Stanislav Malyshev [Sat, 24 Feb 2018 01:57:50 +0000 (17:57 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Set FPM maintainership
Stanislav Malyshev [Sat, 24 Feb 2018 01:57:26 +0000 (17:57 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
[ci skip] Set FPM maintainership
Stanislav Malyshev [Sat, 24 Feb 2018 00:43:10 +0000 (16:43 -0800)]
[ci skip] Set FPM maintainership
As per http://news.php.net/php.internals/101897, Jakub is officially
annointed as new FPM maintainer.
Christoph M. Becker [Fri, 23 Feb 2018 22:53:32 +0000 (23:53 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #75873: pcntl_wexitstatus returns incorrect on Big_Endian platform (s390x)
Christoph M. Becker [Fri, 23 Feb 2018 22:51:15 +0000 (23:51 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75873: pcntl_wexitstatus returns incorrect on Big_Endian platform (s390x)
Sam Ding [Fri, 23 Feb 2018 15:11:18 +0000 (10:11 -0500)]
Fix #75873: pcntl_wexitstatus returns incorrect on Big_Endian platform (s390x)
Cf. https://github.com/php/php-src/pull/3141.
Christoph M. Becker [Fri, 23 Feb 2018 15:23:55 +0000 (16:23 +0100)]
Fix skip condition
The test is not about mhash, but rather about hash.
Christoph M. Becker [Fri, 23 Feb 2018 10:32:18 +0000 (11:32 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix some arginfos
Christoph M. Becker [Fri, 23 Feb 2018 10:28:16 +0000 (11:28 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix some arginfos
Gabriel Caruso [Wed, 21 Feb 2018 04:04:41 +0000 (01:04 -0300)]
Fix some arginfos
* all arguments for ftp_pasv are required
* $varname for getenv function isn't required anymore
* fsockopen and pfsockopen only require $hostname
* strtok can work with only one parameter
* strpbrk needs two parameters to work
* required parameters and add some parameters in openssl_* functions
Gabriel Caruso [Fri, 23 Feb 2018 07:42:27 +0000 (04:42 -0300)]
Use int instead of long in protos
zufuliu [Sat, 13 Jan 2018 09:12:57 +0000 (17:12 +0800)]
Improve similar_text(), reduce recursive call to php_similar_char()
If the longest common substring is the leftmost common substring, there
is no need to check the string prefixes for further common substrings,
since there are none.
Dmitry Stogov [Thu, 22 Feb 2018 12:31:00 +0000 (15:31 +0300)]
Allow generation of VM map
Gabriel Caruso [Mon, 12 Feb 2018 17:26:26 +0000 (15:26 -0200)]
Test ReflectionClass::getReflectionConstant method
Gabriel Caruso [Tue, 20 Feb 2018 23:08:09 +0000 (20:08 -0300)]
Remove duplicated tests
Dmitry Stogov [Thu, 22 Feb 2018 08:33:26 +0000 (11:33 +0300)]
Fixed compilation warnings
Dmitry Stogov [Thu, 22 Feb 2018 08:00:58 +0000 (11:00 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
remove support for string|unicode in tests
improve extension skeleton generator
Dmitry Stogov [Thu, 22 Feb 2018 08:00:29 +0000 (11:00 +0300)]
Fixed build without global register variables
Gabriel Caruso [Tue, 20 Feb 2018 21:59:13 +0000 (18:59 -0300)]
remove support for string|unicode in tests
Pedro Magalhães [Wed, 21 Feb 2018 22:44:06 +0000 (22:44 +0000)]
improve extension skeleton generator
Dmitry Stogov [Wed, 21 Feb 2018 15:43:38 +0000 (18:43 +0300)]
Reorganize make_real_object() related code
Dmitry Stogov [Wed, 21 Feb 2018 14:09:42 +0000 (17:09 +0300)]
Move exceprional code into helper & zend_fetch_var_address_helper() micro-optimization.
Dmitry Stogov [Wed, 21 Feb 2018 13:06:29 +0000 (16:06 +0300)]
Move result address calculation from specialized handlers to less specialized helpers
Anatol Belski [Wed, 21 Feb 2018 10:53:38 +0000 (11:53 +0100)]
Fix def signature to match declaration
Dmitry Stogov [Wed, 21 Feb 2018 09:07:29 +0000 (12:07 +0300)]
Mark exceptional helpers as "cold"
Dmitry Stogov [Wed, 21 Feb 2018 07:10:04 +0000 (10:10 +0300)]
Move exceptional code into helpers
Xinchen Hui [Wed, 21 Feb 2018 02:09:11 +0000 (10:09 +0800)]
Optimized php_stripslash with SSSE3 instr