Daniel Lowrey
3e0a1a71e9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug (#69195 Inconsistent stream crypto values across versions)
Conflicts:
ext/standard/http_fopen_wrapper.c
2015-03-05 21:18:09 -07:00
Daniel Lowrey
10bc5fd4c4
Fixed bug ( #69195 Inconsistent stream crypto values across versions)
...
PHP 5.6.0 altered the semantics of the following constants:
- STREAM_CRYPTO_METHOD_SSLv23_CLIENT
- STREAM_CRYPTO_METHOD_SSLv23_SERVER
- STREAM_CRYPTO_METHOD_TLS_CLIENT
- STREAM_CRYPTO_METHOD_TLS_SERVER
Instead of representing the SSLv23_*() handshake methods the v23
constants were changed to allow only SSLv2 or SSLv3 connections.
Likewise, the TLS methods were modified from using only the TLSv1
handshake to allowing TLS1,1.1, and 1.2. This created a situation
in which users upgrading from previous versions faced a potential
security degradation if they did not update code to use different
constants. In the interest of compatibility across PHP versions
the original semantics have been restored with the following
caveat:
**IMPORTANT**
The SSLv23 client/server methods will no longer negotiate the use
of the insecure SSLv2 or SSLv3 protocols by default. Users wishing
to allow these protocols must explicitly add them to the method
bitmask via the appropriate flags.
2015-03-05 21:09:39 -07:00
Daniel Lowrey
88cfc6ccb6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
main/streams/streams.c
2015-03-05 17:53:04 -07:00
Chris Wright
e7df9d710c
Fix stream_select() issue with OpenSSL buffer
...
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
2015-03-05 17:18:14 -07:00
Dmitry Stogov
28e42b1ded
Improved hash key manangement code
2015-03-06 02:13:47 +03:00
Daniel Lowrey
ca24d19a89
Really fix zts this time
2015-03-05 14:09:25 -07:00
Daniel Lowrey
927b137c1b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix ZTS
Fix ZTS build
Conflicts:
ext/openssl/openssl.c
ext/openssl/xp_ssl.c
2015-03-05 12:24:04 -07:00
Daniel Lowrey
c985ec737d
Fix ZTS
2015-03-05 12:19:15 -07:00
Daniel Lowrey
010f17534f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix ZTS build
2015-03-05 12:13:33 -07:00
Daniel Lowrey
e892f5382f
Fix ZTS build
2015-03-05 12:12:55 -07:00
Adam Harvey
7fa1009560
Like Shady, --with-mysql-sock is back.
...
As Matteo pointed out, MySQLi and PDO_MySQL both rely on this.
2015-03-05 19:00:02 +00:00
Daniel Lowrey
c34ee4b146
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67403 (Add signatureType to openssl_x509_parse)
5.5.24 now
Conflicts:
ext/openssl/openssl.c
2015-03-05 10:27:11 -07:00
Daniel Lowrey
5939de35a8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67403 (Add signatureType to openssl_x509_parse)
5.5.24 now
Conflicts:
configure.in
main/php_version.h
2015-03-05 10:21:32 -07:00
Daniel Lowrey
94140afa69
Fix bug #67403 (Add signatureType to openssl_x509_parse)
2015-03-05 10:09:06 -07:00
Dmitry Stogov
6d065a8545
Avoid repeatable strlen() calls
2015-03-05 18:18:39 +03:00
Dmitry Stogov
bb91bf83f9
Minimize copying of HashTable realocation
2015-03-05 17:22:10 +03:00
Dmitry Stogov
8e3643a8fc
Avoid useless op_array duplication
2015-03-05 14:23:48 +03:00
Anatol Belski
45fb8b517c
fix incompatible pointer
2015-03-05 12:01:27 +01:00
Rasmus Lerdorf
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
Rasmus Lerdorf
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
Daniel Lowrey
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
Daniel Lowrey
65a9a5ca12
Fixed bug #68265 (SAN match fails with trailing DNS dot)
2015-03-04 23:55:42 -07:00
Daniel Lowrey
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
Daniel Lowrey
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
Daniel Lowrey
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
Daniel Lowrey
5dcace058a
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
2015-03-04 22:39:25 -07:00
Daniel Lowrey
ca766e0787
Fix broken test
2015-03-04 22:37:07 -07:00
Xinchen Hui
792630bc50
Use strpprintf
2015-03-05 12:40:09 +08:00
Adam Harvey
592b2545b2
Merge branch 'master' into HEAD
2015-03-05 01:07:36 +00:00
Adam Harvey
10c471a60b
Use a deprecated function that still exists.
2015-03-05 00:51:05 +00:00
Adam Harvey
3253168cde
Remove unnecessary debug warning (that also broke tests).
2015-03-05 00:33:20 +00:00
Adam Harvey
d8b2012ab0
Explicitly depend opcache on pcre.
2015-03-05 00:27:36 +00:00
Adam Harvey
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
Adam Harvey
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
Hannes Magnusson
3c2c029bfd
hexadecimal is case*in*sensitive
2015-03-04 16:03:45 -08:00
Daniel Lowrey
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
Daniel Lowrey
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
Daniel Lowrey
241f3c34b8
Fixed bug #68920 (use strict peer_fingerprint input checks)
2015-03-04 12:47:46 -07:00
Daniel Lowrey
8680fc8331
Improve test to target specific issue
2015-03-04 10:23:46 -05:00
Dmitry Stogov
8ec8648c91
Improved code for class property inheritance
2015-03-04 17:41:01 +03:00
Daniel Lowrey
a39b1898fe
Misc updates/cleanup
2015-03-04 09:24:27 -05:00
Xinchen Hui
ec00a4de4e
Merge branch 'PHP-5.6'
2015-03-04 14:49:03 +08:00
Xinchen Hui
a29b64fc10
Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function)
2015-03-04 14:48:41 +08:00
Xinchen Hui
fffd173b7a
indent
2015-03-04 12:10:23 +08:00
Xinchen Hui
a6ba7966de
Fixed memleak
2015-03-04 12:08:54 +08:00
Xinchen Hui
abfdf3bf52
Merge branch 'fix-compile-error' of https://github.com/zxcvdavid/php-src
2015-03-04 11:39:53 +08:00
Xinchen Hui
c7b7cc4c16
Fixed build
2015-03-04 10:49:55 +08:00
zxcvdavid
a4a85887e0
Fix compile error
2015-03-04 09:56:50 +08:00
zxcvdavid
f1de275e74
Remove the unused vars
2015-03-04 09:52:09 +08:00
Dmitry Stogov
2fa8d67a5c
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.
2015-03-04 02:05:28 +03:00