Dmitry Stogov
ff8337b783
Merge branch 'PHP-7.0'
...
* PHP-7.0:
More effecient fix for bug #71756
2016-03-10 13:34:00 +03:00
Dmitry Stogov
f8506c062f
More effecient fix for bug #71756
2016-03-10 13:33:36 +03:00
Anatol Belski
22475055c6
Merge branch 'PHP-7.0'
...
* PHP-7.0:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752 )
2016-03-10 09:36:32 +01:00
Anatol Belski
4d4c6cf14e
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 )
2016-03-10 09:35:55 +01:00
Xinchen Hui
67f0770036
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752 )
...
cherry-picked from 7d5f71b0b1
2016-03-10 09:33:39 +01:00
Anatol Belski
fd668bed4c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix invalid pointer on 64-bit
2016-03-10 08:45:57 +01:00
Anatol Belski
ce9a582d07
fix invalid pointer on 64-bit
2016-03-10 08:45:46 +01:00
Anatol Belski
3edd33083c
fix invalid pointer on 64-bit
2016-03-10 08:45:29 +01:00
Xinchen Hui
50960d85cc
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 )
2016-03-10 15:43:53 +08:00
Xinchen Hui
753bbad535
Useless check (part of #71753 )
2016-03-10 15:43:22 +08:00
Xinchen Hui
a0fac47364
object->ce should not be NULL
2016-03-10 15:26:15 +08:00
Xinchen Hui
351201bc7b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed typo (partially fix for #71753 )
Conflicts:
ext/standard/uuencode.c
2016-03-10 15:23:40 +08:00
Xinchen Hui
915a3762ef
Fixed typo (partially fix for #71753 )
2016-03-10 15:22:34 +08:00
Xinchen Hui
c3cf6f2a68
emalloc never returns NULL (partially fix for #71753 )
2016-03-10 15:15:26 +08:00
Xinchen Hui
a468901e97
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
2016-03-10 15:10:26 +08:00
Xinchen Hui
675c295722
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
2016-03-10 15:09:51 +08:00
Xinchen Hui
4c388004d4
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 )
2016-03-10 15:03:25 +08:00
Xinchen Hui
98c625a31c
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
2016-03-10 15:02:10 +08:00
Xinchen Hui
9833c76d3f
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
2016-03-10 14:58:10 +08:00
Xinchen Hui
7d5f71b0b1
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752 )
2016-03-10 14:24:13 +08:00
Nikita Popov
97a88fccc0
Merge branch 'PHP-7.0'
2016-03-09 23:01:51 +01:00
Nikita Popov
5a6da79fd0
Fix bug #71659
2016-03-09 23:00:53 +01:00
Nikita Popov
f65486f13d
Add NEWS/UPGRADING for negative string offsets
2016-03-09 14:41:38 +01:00
Francois Laupretre
d0d9e7251e
mb_strpos()/mb_stripos(): Add support for negative offset
2016-03-09 14:41:38 +01:00
Francois Laupretre
882f97042b
mb_ereg_search_setpos(): Add support for negative position
...
Also add missing test for this function
2016-03-09 14:41:38 +01:00
Francois Laupretre
70187267b4
mb_strimwidth(): Add support for negative 'start' and 'width'
2016-03-09 14:41:38 +01:00
Francois Laupretre
e30060da15
file_get_contents(): Add support for negative offset
2016-03-09 14:41:38 +01:00
Francois Laupretre
570bbed98e
Add negative offset support to iconv_strpos()
2016-03-09 14:41:38 +01:00
Francois Laupretre
4a8c51c7d7
Add negative offset support to grapheme_strpos/stripos/extract()
2016-03-09 14:41:37 +01:00
Francois Laupretre
1c3e1a3d28
substr_count(): Support negative values for '$offset' and '$length' parameters.
2016-03-09 14:41:37 +01:00
Francois Laupretre
56fce8990f
strpos()/stripos(): Add support for negative offsets
2016-03-09 14:41:37 +01:00
Francois Laupretre
370b7039e4
Add support for negative string offsets (syntax)
2016-03-09 14:41:37 +01:00
Anatol Belski
aa2cf3a4f2
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix SKIPIF sections
2016-03-09 14:29:03 +01:00
Anatol Belski
86229f9943
fix SKIPIF sections
2016-03-09 14:28:38 +01:00
Anatol Belski
d6aba2981c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix directory separator
2016-03-09 14:17:44 +01:00
Anatol Belski
a2022fd82a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix directory separator
2016-03-09 14:17:30 +01:00
Anatol Belski
a1d1f54b42
fix directory separator
2016-03-09 14:16:29 +01:00
Xinchen Hui
f2d2e8ceb9
arena_alloc never returns NULL
2016-03-09 18:05:28 +08:00
Xinchen Hui
14fec3adf9
Suppress warnings
2016-03-09 18:01:29 +08:00
Xinchen Hui
352456ed9a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
2016-03-09 12:16:46 +08:00
Xinchen Hui
9aa73d3800
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
2016-03-09 12:16:24 +08:00
Anatol Belski
58c82ff0b0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix regression introduced in 5683b6fa39
2016-03-08 13:16:46 +01:00
Anatol Belski
7a4c2fa829
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix regression introduced in 5683b6fa39
2016-03-08 13:16:08 +01:00
Anatol Belski
8ca02bb233
fix regression introduced in 5683b6fa39
...
Test extended. Basically, both iterator type and next node have
to be checked.
2016-03-08 12:59:59 +01:00
Anatol Belski
69d3b01d9c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix incompatible pointers on 64-bit
2016-03-07 22:05:46 +01:00
Anatol Belski
89a4342507
fix incompatible pointers on 64-bit
2016-03-07 22:01:44 +01:00
Anatol Belski
45894d922f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix double free and move temps into local scope
add error check
2016-03-07 16:40:23 +01:00
Anatol Belski
f7e81fd9f1
fix double free and move temps into local scope
2016-03-07 16:38:47 +01:00
Anatol Belski
0fccddba75
add error check
2016-03-07 16:26:01 +01:00
Nikita Popov
35b34d7235
Merge branch 'PHP-7.0'
...
Conflicts:
Zend/zend_language_scanner.c
2016-03-06 21:39:20 +01:00