Dmitry Stogov
66f5a1e8b4
Make fast path linear
2015-03-06 17:07:36 +03:00
Dmitry Stogov
53d8e5fc63
Improved hash key manangement code
2015-03-06 16:26:40 +03:00
Tjerk Meesters
1236a30746
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68917 (parse_url fails on some partial urls)
Update test to run locally instead of remotely
2015-03-06 20:59:52 +08:00
Tjerk Meesters
469b5a9584
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68917 (parse_url fails on some partial urls)
2015-03-06 20:58:20 +08:00
Tjerk Meesters
d7fb52ea20
Fixed bug #68917 (parse_url fails on some partial urls)
2015-03-06 20:51:22 +08:00
Dmitry Stogov
4bc7ee2eb7
Fixed conditions
2015-03-06 11:00:19 +03:00
Dmitry Stogov
8308e617f1
Revert "Fix logical-op-parentheses warning"
...
This reverts commit b7408234b9
.
2015-03-06 10:56:19 +03:00
Daniel Lowrey
eef261f0e4
Update test to run locally instead of remotely
2015-03-05 22:01:15 -07:00
Daniel Lowrey
e82878a200
Update test to run locally instead of remotely
2015-03-05 22:00:38 -07:00
Reeze Xia
b7408234b9
Fix logical-op-parentheses warning
...
What a condition ;-)
2015-03-06 12:20:01 +08:00
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
39501bed3b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Really fix zts this time
Conflicts:
ext/openssl/xp_ssl.c
2015-03-05 14:11:35 -07:00
Daniel Lowrey
ca24d19a89
Really fix zts this time
2015-03-05 14:09:25 -07:00
Ferenc Kovacs
db1a668d62
Merge branch 'PHP-5.6'
...
* PHP-5.6:
re-arrange NEWS
2015-03-05 21:07:34 +01:00
Ferenc Kovacs
33828f002d
re-arrange NEWS
2015-03-05 21:07:05 +01: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
Ferenc Kovacs
bb103e53ed
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.6.8 up next
2015-03-05 19:08:46 +01:00
Ferenc Kovacs
d4d05c8919
5.6.8 up next
2015-03-05 19:07:23 +01: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
a3674a5dcb
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Unused var
2015-03-05 18:19:27 +03:00
Dmitry Stogov
6d065a8545
Avoid repeatable strlen() calls
2015-03-05 18:18:39 +03:00
Xinchen Hui
1ebdbdfd78
Unused var
2015-03-05 23:09:58 +08:00
Dmitry Stogov
bb91bf83f9
Minimize copying of HashTable realocation
2015-03-05 17:22:10 +03:00
Julien Pauli
0f334a1265
5.5.24 now
2015-03-05 14:13:39 +01:00
Xinchen Hui
eadff75c7d
Merge branch 'PHP-5.6'
2015-03-05 21:10:02 +08:00
Xinchen Hui
e8e5913e5e
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-05 21:06:07 +08:00
Xinchen Hui
869f8bd24b
Error also maybe happened here
2015-03-05 21:05:26 +08:00
Dmitry Stogov
8e3643a8fc
Avoid useless op_array duplication
2015-03-05 14:23:48 +03:00
Xinchen Hui
eec5ab7672
Merge branch 'PHP-5.6'
2015-03-05 19:06:02 +08:00
Xinchen Hui
7bcdbcf98e
Revert commit to zend signal by mistake
2015-03-05 19:04:43 +08:00
Anatol Belski
45fb8b517c
fix incompatible pointer
2015-03-05 12:01:27 +01:00
Xinchen Hui
2f88a2d520
Merge branch 'cleanup' of https://github.com/zxcvdavid/php-src
2015-03-05 18:45:00 +08:00
Xinchen Hui
f2c8b611cf
Merge branch 'PHP-5.6'
2015-03-05 18:44:13 +08:00
Xinchen Hui
56f9dc2d59
Update NEWs
2015-03-05 18:40:25 +08:00
Xinchen Hui
168be6f250
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-05 18:40:06 +08:00
Xinchen Hui
f039225597
Fixed bug #69174 (leaks when unused inner class use traits precedence)
2015-03-05 18:39:50 +08:00
Xinchen Hui
fd5a756ad4
Revive Zend Signals handler (and fixed bug #61083 )
2015-03-05 18:11:22 +08:00
Reeze Xia
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
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