f6be936e10
added mb_ord
2015-03-08 02:03:42 +09:00
5f41bff45b
added php_mb_check_encoding
2015-03-08 02:03:42 +09:00
be7371f9ff
fix data type
2015-03-06 16:49:08 +01:00
9577a20b3b
fix invalid write
2015-03-06 16:42:31 +01:00
66f5a1e8b4
Make fast path linear
2015-03-06 17:07:36 +03:00
53d8e5fc63
Improved hash key manangement code
2015-03-06 16:26:40 +03:00
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
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
d7fb52ea20
Fixed bug #68917 (parse_url fails on some partial urls)
2015-03-06 20:51:22 +08:00
4bc7ee2eb7
Fixed conditions
2015-03-06 11:00:19 +03:00
8308e617f1
Revert "Fix logical-op-parentheses warning"
...
This reverts commit b7408234b9
2015-03-06 10:56:19 +03:00
eef261f0e4
Update test to run locally instead of remotely
2015-03-05 22:01:15 -07:00
e82878a200
Update test to run locally instead of remotely
2015-03-05 22:00:38 -07:00
b7408234b9
Fix logical-op-parentheses warning
...
What a condition ;-)
2015-03-06 12:20:01 +08:00
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
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
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
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
28e42b1ded
Improved hash key manangement code
2015-03-06 02:13:47 +03:00
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
ca24d19a89
Really fix zts this time
2015-03-05 14:09:25 -07:00
db1a668d62
Merge branch 'PHP-5.6'
...
* PHP-5.6:
re-arrange NEWS
2015-03-05 21:07:34 +01:00
33828f002d
re-arrange NEWS
2015-03-05 21:07:05 +01:00
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
c985ec737d
Fix ZTS
2015-03-05 12:19:15 -07:00
010f17534f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix ZTS build
2015-03-05 12:13:33 -07:00
e892f5382f
Fix ZTS build
2015-03-05 12:12:55 -07:00
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
bb103e53ed
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.6.8 up next
2015-03-05 19:08:46 +01:00
d4d05c8919
5.6.8 up next
2015-03-05 19:07:23 +01:00
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
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
94140afa69
Fix bug #67403 (Add signatureType to openssl_x509_parse)
2015-03-05 10:09:06 -07:00
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
6d065a8545
Avoid repeatable strlen() calls
2015-03-05 18:18:39 +03:00
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
0f334a1265
5.5.24 now
2015-03-05 14:13:39 +01: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
Masaki Kagaya