]>
granicus.if.org Git - php/log
Anatol Belski [Mon, 14 Mar 2016 15:45:12 +0000 (16:45 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix pointer truncation on 64 bit
Anatol Belski [Mon, 14 Mar 2016 15:44:27 +0000 (16:44 +0100)]
fix pointer truncation on 64 bit
Anatol Belski [Mon, 14 Mar 2016 14:58:40 +0000 (15:58 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test
Update NEWS
Anatol Belski [Mon, 14 Mar 2016 14:58:05 +0000 (15:58 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test
Anatol Belski [Mon, 14 Mar 2016 14:53:02 +0000 (15:53 +0100)]
fix test
Many warnings won't appear with libxml2 >= 2.9.3 because in many
cases libxml2 2.9.3 will just abort processing.
Yasuo Ohgaki [Fri, 11 Mar 2016 23:52:16 +0000 (08:52 +0900)]
Update NEWS
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies
All of these bugs are caused by git global change in PHP-7.0.
Yasuo Ohgaki [Fri, 11 Mar 2016 23:39:51 +0000 (08:39 +0900)]
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies
All of these bug is caused by git global change in PHP-7.0.
Yasuo Ohgaki [Fri, 11 Mar 2016 23:33:04 +0000 (08:33 +0900)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Yasuo Ohgaki [Fri, 11 Mar 2016 23:15:47 +0000 (08:15 +0900)]
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Nikita Popov [Fri, 11 Mar 2016 21:45:52 +0000 (22:45 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Fri, 11 Mar 2016 21:45:38 +0000 (22:45 +0100)]
Fixed bug #71806
Nikita Popov [Fri, 11 Mar 2016 21:28:50 +0000 (22:28 +0100)]
Merge branch 'PHP-7.0'
Grigorii Sokolik [Fri, 11 Mar 2016 16:28:45 +0000 (19:28 +0300)]
Fix bug #71767
Dmitry Stogov [Fri, 11 Mar 2016 13:51:06 +0000 (16:51 +0300)]
Added ability to avoid code generation for useless opcode handlers.
- SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding.
- SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
Anatol Belski [Fri, 11 Mar 2016 13:24:03 +0000 (14:24 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:23:34 +0000 (14:23 +0100)]
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:23:07 +0000 (14:23 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:22:11 +0000 (14:22 +0100)]
update NEWS
Anatol Belski [Fri, 11 Mar 2016 13:13:11 +0000 (14:13 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix DatePeriod::getEndDate() segfault
Anatol Belski [Fri, 11 Mar 2016 13:12:54 +0000 (14:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix DatePeriod::getEndDate() segfault
Thomas Punt [Mon, 7 Mar 2016 09:40:22 +0000 (09:40 +0000)]
Fix DatePeriod::getEndDate() segfault
Dmitry Stogov [Fri, 11 Mar 2016 10:38:53 +0000 (13:38 +0300)]
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
Dmitry Stogov [Fri, 11 Mar 2016 09:17:03 +0000 (12:17 +0300)]
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
Anatol Belski [Thu, 10 Mar 2016 16:11:42 +0000 (17:11 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix build with clang on Winodws
Dmitry Stogov [Thu, 10 Mar 2016 15:31:02 +0000 (18:31 +0300)]
Remove NOPs after DFA pass.
Anatol Belski [Thu, 10 Mar 2016 14:30:20 +0000 (15:30 +0100)]
fix build with clang on Winodws
Anatol Belski [Thu, 10 Mar 2016 10:40:08 +0000 (11:40 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix error condition, part of bug #71753
Anatol Belski [Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix error condition, part of bug #71753
Anatol Belski [Thu, 10 Mar 2016 10:35:50 +0000 (11:35 +0100)]
fix error condition, part of bug #71753
Dmitry Stogov [Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Dmitry Stogov [Thu, 10 Mar 2016 10:34:25 +0000 (13:34 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Dmitry Stogov [Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
More effecient fix for bug #71756
Dmitry Stogov [Thu, 10 Mar 2016 10:33:36 +0000 (13:33 +0300)]
More effecient fix for bug #71756
Anatol Belski [Thu, 10 Mar 2016 08:36:32 +0000 (09:36 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Anatol Belski [Thu, 10 Mar 2016 08:35:55 +0000 (09:35 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Xinchen Hui [Thu, 10 Mar 2016 06:24:13 +0000 (14:24 +0800)]
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
cherry-picked from
7d5f71b0b125c89211e5a2a6d925deba938abd41
Anatol Belski [Thu, 10 Mar 2016 07:45:57 +0000 (08:45 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix invalid pointer on 64-bit
Anatol Belski [Thu, 10 Mar 2016 07:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit
Anatol Belski [Thu, 10 Mar 2016 07:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit
Xinchen Hui [Thu, 10 Mar 2016 07:43:53 +0000 (15:43 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Useless check (part of #71753)
object->ce should not be NULL
Fixed typo (partially fix for #71753)
emalloc never returns NULL (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:43:22 +0000 (15:43 +0800)]
Useless check (part of #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:26:15 +0000 (15:26 +0800)]
object->ce should not be NULL
Xinchen Hui [Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed typo (partially fix for #71753)
Conflicts:
ext/standard/uuencode.c
Xinchen Hui [Thu, 10 Mar 2016 07:22:34 +0000 (15:22 +0800)]
Fixed typo (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:15:26 +0000 (15:15 +0800)]
emalloc never returns NULL (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:10:26 +0000 (15:10 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
Xinchen Hui [Thu, 10 Mar 2016 07:09:51 +0000 (15:09 +0800)]
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
Xinchen Hui [Thu, 10 Mar 2016 07:03:25 +0000 (15:03 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Xinchen Hui [Thu, 10 Mar 2016 07:02:10 +0000 (15:02 +0800)]
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Xinchen Hui [Thu, 10 Mar 2016 06:58:10 +0000 (14:58 +0800)]
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
Xinchen Hui [Thu, 10 Mar 2016 06:24:13 +0000 (14:24 +0800)]
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Nikita Popov [Wed, 9 Mar 2016 22:01:51 +0000 (23:01 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 9 Mar 2016 21:58:57 +0000 (22:58 +0100)]
Fix bug #71659
Nikita Popov [Wed, 9 Mar 2016 13:41:08 +0000 (14:41 +0100)]
Add NEWS/UPGRADING for negative string offsets
Francois Laupretre [Tue, 5 Jan 2016 15:41:10 +0000 (16:41 +0100)]
mb_strpos()/mb_stripos(): Add support for negative offset
Francois Laupretre [Mon, 4 Jan 2016 15:31:52 +0000 (16:31 +0100)]
mb_ereg_search_setpos(): Add support for negative position
Also add missing test for this function
Francois Laupretre [Sun, 3 Jan 2016 12:47:20 +0000 (13:47 +0100)]
mb_strimwidth(): Add support for negative 'start' and 'width'
Francois Laupretre [Wed, 30 Dec 2015 13:23:37 +0000 (14:23 +0100)]
file_get_contents(): Add support for negative offset
Francois Laupretre [Thu, 24 Dec 2015 18:03:10 +0000 (19:03 +0100)]
Add negative offset support to iconv_strpos()
Francois Laupretre [Fri, 11 Sep 2015 23:27:05 +0000 (01:27 +0200)]
Add negative offset support to grapheme_strpos/stripos/extract()
Francois Laupretre [Thu, 23 Jul 2015 02:01:23 +0000 (04:01 +0200)]
substr_count(): Support negative values for '$offset' and '$length' parameters.
Francois Laupretre [Wed, 22 Jul 2015 22:08:57 +0000 (00:08 +0200)]
strpos()/stripos(): Add support for negative offsets
Francois Laupretre [Tue, 21 Jul 2015 20:16:08 +0000 (22:16 +0200)]
Add support for negative string offsets (syntax)
Anatol Belski [Wed, 9 Mar 2016 13:29:03 +0000 (14:29 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix SKIPIF sections
Anatol Belski [Wed, 9 Mar 2016 13:28:38 +0000 (14:28 +0100)]
fix SKIPIF sections
Anatol Belski [Wed, 9 Mar 2016 13:17:44 +0000 (14:17 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix directory separator
Anatol Belski [Wed, 9 Mar 2016 13:17:30 +0000 (14:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix directory separator
Anatol Belski [Wed, 9 Mar 2016 13:16:29 +0000 (14:16 +0100)]
fix directory separator
Xinchen Hui [Wed, 9 Mar 2016 10:05:28 +0000 (18:05 +0800)]
arena_alloc never returns NULL
Xinchen Hui [Wed, 9 Mar 2016 10:01:29 +0000 (18:01 +0800)]
Suppress warnings
Xinchen Hui [Wed, 9 Mar 2016 04:16:46 +0000 (12:16 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
Xinchen Hui [Wed, 9 Mar 2016 04:16:24 +0000 (12:16 +0800)]
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
Anatol Belski [Tue, 8 Mar 2016 12:16:46 +0000 (13:16 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix regression introduced in
5683b6fa39
Anatol Belski [Tue, 8 Mar 2016 12:16:08 +0000 (13:16 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix regression introduced in
5683b6fa39
Anatol Belski [Tue, 8 Mar 2016 11:59:59 +0000 (12:59 +0100)]
fix regression introduced in
5683b6fa39
Test extended. Basically, both iterator type and next node have
to be checked.
Anatol Belski [Mon, 7 Mar 2016 21:05:46 +0000 (22:05 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix incompatible pointers on 64-bit
Anatol Belski [Mon, 7 Mar 2016 21:01:44 +0000 (22:01 +0100)]
fix incompatible pointers on 64-bit
Anatol Belski [Mon, 7 Mar 2016 15:40:23 +0000 (16:40 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix double free and move temps into local scope
add error check
Anatol Belski [Mon, 7 Mar 2016 15:38:47 +0000 (16:38 +0100)]
fix double free and move temps into local scope
Anatol Belski [Mon, 7 Mar 2016 15:26:01 +0000 (16:26 +0100)]
add error check
Nikita Popov [Sun, 6 Mar 2016 20:39:20 +0000 (21:39 +0100)]
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_language_scanner.c
Nikita Popov [Sun, 6 Mar 2016 20:38:21 +0000 (21:38 +0100)]
Fixed bug #71724
Anatol Belski [Fri, 4 Mar 2016 11:27:43 +0000 (12:27 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix ibase connection routine
Anatol Belski [Fri, 4 Mar 2016 11:26:25 +0000 (12:26 +0100)]
fix ibase connection routine
followup on
a7028d96
Anatol Belski [Fri, 4 Mar 2016 09:57:38 +0000 (10:57 +0100)]
fix initializer for empty_fcall_info
Nikita Popov [Thu, 3 Mar 2016 22:50:51 +0000 (23:50 +0100)]
Merge branch 'PHP-7.0'
Tjerk Meesters [Thu, 3 Mar 2016 22:48:45 +0000 (23:48 +0100)]
Fix one zpp usage in interbase
Also small tweak to zpp REAME
Nikita Popov [Thu, 3 Mar 2016 22:20:50 +0000 (23:20 +0100)]
Merge branch 'PHP-7.0'
Conflicts:
ext/mysqlnd/mysqlnd_priv.h
main/php_streams.h
Nikita Popov [Thu, 3 Mar 2016 22:13:50 +0000 (23:13 +0100)]
Eliminate usages of _PP macros
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
Nikita Popov [Thu, 3 Mar 2016 18:27:41 +0000 (19:27 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 3 Mar 2016 18:26:22 +0000 (19:26 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 14 Jul 2015 09:09:03 +0000 (11:09 +0200)]
Fixed bug #69953
Added support for MKCALENDAR request method in CLI web server.
Nikita Popov [Thu, 3 Mar 2016 16:30:05 +0000 (17:30 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 3 Mar 2016 16:29:58 +0000 (17:29 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Anton Blanchard [Thu, 3 Mar 2016 16:28:34 +0000 (17:28 +0100)]
Additional improvements to crypt() detection code
Reformat to normalize tabs vs spaces, return 1 if crypt.h not
defined, fix C99 compliance.
Nikita Popov [Thu, 3 Mar 2016 16:14:25 +0000 (17:14 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 3 Mar 2016 16:14:18 +0000 (17:14 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Michael Orlitzky [Mon, 9 Nov 2015 15:49:10 +0000 (10:49 -0500)]
ext/standard/config.m4: fix crypt() test segfaults in >=glibc-2.17.
Starting with glibc-2.17, the crypt() function will report an EINVAL
and return NULL when the format of the "salt" parameter is
invalid. The current tests for crypt() pass its result to strcmp(),
causing segfaults when the value returned from crypt() is NULL.
This commit modifies the test programs to exit with failure when
crypt() returns NULL.
Reference: https://bugs.gentoo.org/show_bug.cgi?id=518964
Nikita Popov [Thu, 3 Mar 2016 15:56:05 +0000 (16:56 +0100)]
Bump API numbers
Otherwise can't distinguish 7.0 and 7.1. Gotta add those #if's for
the FCI change...
Nikita Popov [Thu, 3 Mar 2016 15:50:47 +0000 (16:50 +0100)]
Merge branch 'PHP-7.0'