Anatol Belski
d26d80ab75
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix DatePeriod::getEndDate() segfault
2016-03-11 14:12:54 +01:00
Thomas Punt
f3f5a07aa5
Fix DatePeriod::getEndDate() segfault
2016-03-11 14:08:48 +01:00
Anatol Belski
741bfe3932
fix build with clang on Winodws
2016-03-10 15:30:20 +01:00
Anatol Belski
8b5d09a195
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix error condition, part of bug #71753
2016-03-10 11:39:16 +01:00
Anatol Belski
8cd903ea68
fix error condition, part of bug #71753
2016-03-10 11:35:50 +01:00
Dmitry Stogov
99c44458da
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 )
2016-03-10 13:34:41 +03:00
Dmitry Stogov
f8506c062f
More effecient fix for bug #71756
2016-03-10 13:33:36 +03: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
3edd33083c
fix invalid pointer on 64-bit
2016-03-10 08:45:29 +01: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
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
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
5a6da79fd0
Fix bug #71659
2016-03-09 23:00:53 +01:00
Anatol Belski
86229f9943
fix SKIPIF sections
2016-03-09 14:28:38 +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
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
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
89a4342507
fix incompatible pointers on 64-bit
2016-03-07 22:01:44 +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
860dc17ab7
Fixed bug #71724
2016-03-06 21:38:21 +01:00
Anatol Belski
be5bbe7068
fix ibase connection routine
...
followup on a7028d96
2016-03-04 12:26:25 +01:00
Tjerk Meesters
a7028d9671
Fix one zpp usage in interbase
...
Also small tweak to zpp REAME
2016-03-03 23:50:02 +01:00
Nikita Popov
5602f64213
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.
2016-03-03 23:20:12 +01:00
Nikita Popov
3240dd93b3
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 19:27:35 +01:00
Christoph M. Becker
2d4ad66ff2
Fixed bug #69953
...
Added support for MKCALENDAR request method in CLI web server.
2016-03-03 19:22:38 +01:00
Nikita Popov
159602bd86
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 17:29:58 +01:00
Anton Blanchard
ccd215a517
Additional improvements to crypt() detection code
...
Reformat to normalize tabs vs spaces, return 1 if crypt.h not
defined, fix C99 compliance.
2016-03-03 17:28:34 +01:00
Nikita Popov
5a01605b4b
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 17:14:18 +01:00
Michael Orlitzky
08fce8e2c5
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
2016-03-03 17:12:57 +01:00
Nikita Popov
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
James Titcumb
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
Nikita Popov
5527c5b083
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 16:38:13 +01:00
Nikita Popov
a4e56194d7
Fix intermixed SKIPIF and XFAIL sections in test
2016-03-03 16:38:05 +01:00
Nikita Popov
bdd578fcbb
Disable upload_2G test on travis
2016-03-03 16:35:45 +01:00
Anatol Belski
4f0042bead
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
show correct MINFO with libpq >= 9.5.x
2016-03-02 17:05:05 +01:00
Anatol Belski
2399c64eaf
show correct MINFO with libpq >= 9.5.x
2016-03-02 17:03:20 +01:00
Dmitry Stogov
908b662f7f
PHP-7 zend_call_function() doesn't support symbol_table substitution
2016-03-02 16:56:39 +03:00
Dmitry Stogov
b6bbe33f05
Better fix for IS_INDIRECT support in zend_hash_merge()
2016-03-02 15:09:04 +03:00
Julien Pauli
914d33c40e
Going for 5.5.34
2016-03-02 11:02:42 +01:00
Dmitry Stogov
afedd4fd59
Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
2016-03-02 13:01:42 +03:00