1ebdbdfd78
Unused var
2015-03-05 23:09:58 +08:00
bb91bf83f9
Minimize copying of HashTable realocation
2015-03-05 17:22:10 +03:00
eadff75c7d
Merge branch 'PHP-5.6'
2015-03-05 21:10:02 +08:00
e8e5913e5e
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-05 21:06:07 +08:00
869f8bd24b
Error also maybe happened here
2015-03-05 21:05:26 +08:00
8e3643a8fc
Avoid useless op_array duplication
2015-03-05 14:23:48 +03:00
eec5ab7672
Merge branch 'PHP-5.6'
2015-03-05 19:06:02 +08:00
7bcdbcf98e
Revert commit to zend signal by mistake
2015-03-05 19:04:43 +08:00
45fb8b517c
fix incompatible pointer
2015-03-05 12:01:27 +01:00
2f88a2d520
Merge branch 'cleanup' of https://github.com/zxcvdavid/php-src
2015-03-05 18:45:00 +08:00
f2c8b611cf
Merge branch 'PHP-5.6'
2015-03-05 18:44:13 +08:00
56f9dc2d59
Update NEWs
2015-03-05 18:40:25 +08:00
168be6f250
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-05 18:40:06 +08:00
f039225597
Fixed bug #69174 (leaks when unused inner class use traits precedence)
2015-03-05 18:39:50 +08:00
fd5a756ad4
Revive Zend Signals handler (and fixed bug #61083 )
2015-03-05 18:11:22 +08:00
c498cc7407
Merge branch 'pull-request/1142'
...
* pull-request/1142:
Fixed wrong parameter type of php_stream_mmap_range()
2015-03-05 17:05:21 +08:00
eaa1b3e614
This test fails with multibyte on because it spews
...
a conversion error on the bogus file
2015-03-05 00:45:42 -08:00
d7810cc0fa
This test fails with multibyte on because it spews
...
a conversion error on the bogus file
2015-03-05 00:44:47 -08:00
488688cfc7
Remove the unused vars
2015-03-05 15:55:30 +08:00
73de105481
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68265 (SAN match fails with trailing DNS dot)
2015-03-04 23:56:36 -07:00
65a9a5ca12
Fixed bug #68265 (SAN match fails with trailing DNS dot)
2015-03-04 23:55:42 -07:00
fe29b8134c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
hexadecimal is case*in*sensitive
Conflicts:
ext/openssl/xp_ssl.c
2015-03-04 23:00:59 -07:00
1de1ff75f5
Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6
...
* 'PHP-5.6' of https://github.com/bjori/php-src :
hexadecimal is case*in*sensitive
2015-03-04 22:55:22 -07:00
94a70b98a6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
Fix broken test
Conflicts:
ext/openssl/xp_ssl.c
2015-03-04 22:42:25 -07:00
5dcace058a
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
2015-03-04 22:39:25 -07:00
ca766e0787
Fix broken test
2015-03-04 22:37:07 -07:00
792630bc50
Use strpprintf
2015-03-05 12:40:09 +08:00
592b2545b2
Merge branch 'master' into HEAD
2015-03-05 01:07:36 +00:00
10c471a60b
Use a deprecated function that still exists.
2015-03-05 00:51:05 +00:00
3253168cde
Remove unnecessary debug warning (that also broke tests).
2015-03-05 00:33:20 +00:00
d8b2012ab0
Explicitly depend opcache on pcre.
2015-03-05 00:27:36 +00:00
cdb82d879c
Update UPGRADING.
2015-03-05 00:27:21 +00:00
fea9a6fc77
Merge remote-tracking branch 'datibbaw/kill-ereg'
...
Conflicts:
ext/ereg/config.w32
ext/ereg/config0.m4
ext/ereg/ereg.c
ext/ereg/php_ereg.h
ext/ereg/php_regex.h
ext/ereg/regex/engine.c
ext/ereg/regex/main.c
ext/ereg/regex/regcomp.c
ext/ereg/regex/regerror.c
ext/ereg/tests/split_error_002.phpt
ext/ereg/tests/split_variation_003.phpt
ext/ereg/tests/spliti_error_002.phpt
ext/ereg/tests/spliti_variation_003.phpt
ext/pgsql/pgsql.c
sapi/apache/php_apache_http.h
sapi/apache_hooks/php_apache_http.h
2015-03-05 00:21:38 +00:00
fd1578c196
Remove the deprecated MySQL extension.
...
Relevant RFC: https://wiki.php.net/rfc/remove_deprecated_functionality_in_php7
2015-03-05 00:18:40 +00:00
3c2c029bfd
hexadecimal is case*in*sensitive
2015-03-04 16:03:45 -08:00
6dfff52f61
Improved method inhereitance code and cleanup
2015-03-05 02:10:38 +03:00
b5d97140c0
Merge branch 'tls-alpn'
...
* tls-alpn:
Improve test to target specific issue
Misc updates/cleanup
Add TLS ALPN extension support in crypto client/server streams
Add stream_socket_crypto_info() function
Update for compatibility with newer openssl libs
2015-03-04 13:56:58 -07:00
c9bd24de7a
Improved ineritance code
2015-03-04 23:06:07 +03:00
5de64a29e6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68920 (use strict peer_fingerprint input checks)
Conflicts:
ext/openssl/xp_ssl.c
2015-03-04 12:50:35 -07:00
241f3c34b8
Fixed bug #68920 (use strict peer_fingerprint input checks)
2015-03-04 12:47:46 -07:00
01ccfb7cc9
fix ini registry handling
2015-03-04 19:27:45 +01:00
8680fc8331
Improve test to target specific issue
2015-03-04 10:23:46 -05:00
ff039c3c6d
Merge commit 'refs/pull/1066/head' of git://github.com/php/php-src
...
* git://github.com/php/php-src:
Add zend assert deleted by accident
Let's keep it simple
Improve internal function return types checking for parent
2015-03-04 18:17:06 +03:00
13eed2676d
Merge commit 'refs/pull/1137/head' of git://github.com/php/php-src
...
* git://github.com/php/php-src:
Optimize class constant declare compilation
2015-03-04 18:07:07 +03:00
68d4575132
Merge branch 'pull-request/1128'
...
* pull-request/1128:
Fixed memleak in alloc_globals_ctor
2015-03-04 17:55:02 +03:00
8ec8648c91
Improved code for class property inheritance
2015-03-04 17:41:01 +03:00
a39b1898fe
Misc updates/cleanup
2015-03-04 09:24:27 -05:00
fefbddf22b
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-04 18:27:18 +08:00
6b8d5b01bc
Add test for previously fixed segfault
2015-03-04 18:26:58 +08:00
fc5d9175b6
ensure the mail() socket is not leaked after request
2015-03-04 10:24:44 +01:00
Xinchen Hui