f2d2e8ceb9
arena_alloc never returns NULL
2016-03-09 18:05:28 +08:00
14fec3adf9
Suppress warnings
2016-03-09 18:01:29 +08:00
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
9aa73d3800
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
2016-03-09 12:16:24 +08:00
58c82ff0b0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix regression introduced in 5683b6fa39
2016-03-08 13:16:46 +01:00
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
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
69d3b01d9c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix incompatible pointers on 64-bit
2016-03-07 22:05:46 +01:00
89a4342507
fix incompatible pointers on 64-bit
2016-03-07 22:01:44 +01:00
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
f7e81fd9f1
fix double free and move temps into local scope
2016-03-07 16:38:47 +01:00
0fccddba75
add error check
2016-03-07 16:26:01 +01:00
35b34d7235
Merge branch 'PHP-7.0'
...
Conflicts:
Zend/zend_language_scanner.c
2016-03-06 21:39:20 +01:00
860dc17ab7
Fixed bug #71724
2016-03-06 21:38:21 +01:00
df87963b90
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix ibase connection routine
2016-03-04 12:27:43 +01:00
be5bbe7068
fix ibase connection routine
...
followup on a7028d96
2016-03-04 12:26:25 +01:00
b360ba651d
fix initializer for empty_fcall_info
2016-03-04 10:57:38 +01:00
5a0594d12d
Merge branch 'PHP-7.0'
2016-03-03 23:50:51 +01:00
a7028d9671
Fix one zpp usage in interbase
...
Also small tweak to zpp REAME
2016-03-03 23:50:02 +01:00
7ed893712f
Merge branch 'PHP-7.0'
...
Conflicts:
ext/mysqlnd/mysqlnd_priv.h
main/php_streams.h
2016-03-03 23:20:50 +01:00
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
6c8dd3eb04
Merge branch 'PHP-7.0'
2016-03-03 19:27:41 +01:00
3240dd93b3
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 19:27:35 +01:00
2d4ad66ff2
Fixed bug #69953
...
Added support for MKCALENDAR request method in CLI web server.
2016-03-03 19:22:38 +01:00
457aa82bd4
Merge branch 'PHP-7.0'
2016-03-03 17:30:05 +01:00
159602bd86
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 17:29:58 +01:00
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
536b08fa18
Merge branch 'PHP-7.0'
2016-03-03 17:14:25 +01:00
5a01605b4b
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 17:14:18 +01:00
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
1ce0187659
Bump API numbers
...
Otherwise can't distinguish 7.0 and 7.1. Gotta add those #if's for
the FCI change...
2016-03-03 17:02:51 +01:00
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
5527c5b083
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 16:38:13 +01:00
a4e56194d7
Fix intermixed SKIPIF and XFAIL sections in test
2016-03-03 16:38:05 +01:00
bdd578fcbb
Disable upload_2G test on travis
2016-03-03 16:35:45 +01:00
a9a26100b4
unpack() function accepts an additional optional argument $offset.
2016-03-03 13:49:45 +03:00
de3e033010
Merge branch 'PHP-7.0'
...
* PHP-7.0:
show correct MINFO with libpq >= 9.5.x
2016-03-02 17:06:03 +01:00
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
2399c64eaf
show correct MINFO with libpq >= 9.5.x
2016-03-02 17:03:20 +01:00
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03:00
960b3755b3
Merge branch 'PHP-7.0'
...
* PHP-7.0:
PHP-7 zend_call_function() doesn't support symbol_table substitution
2016-03-02 16:57:08 +03:00
908b662f7f
PHP-7 zend_call_function() doesn't support symbol_table substitution
2016-03-02 16:56:39 +03:00
701edb8c82
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Better fix for IS_INDIRECT support in zend_hash_merge()
2016-03-02 15:09:50 +03:00
b6bbe33f05
Better fix for IS_INDIRECT support in zend_hash_merge()
2016-03-02 15:09:04 +03:00
95eda16fe9
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
2016-03-02 13:03:22 +03:00
afedd4fd59
Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
2016-03-02 13:01:42 +03:00
e66ac376cf
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Introduce zend_symtable_exists_ind() for API consistency
2016-03-02 11:54:44 +03:00
ab800642df
Introduce zend_symtable_exists_ind() for API consistency
2016-03-02 11:53:47 +03:00
Xinchen Hui