clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,530 Commits 494 Branches 1,367 Tags 803 MiB
609f05fc19
Commit Graph

37946 Commits

Author SHA1 Message Date
Reeze Xia
609f05fc19 ZTS cleanup 2015-03-08 19:25:55 +08:00
Jakub Zelenka
0cb869d908 Merge branch 'pull-request/1151' 2015-03-08 10:47:22 +00:00
Remi Collet
02808aeca3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix odbc build as shared
 2015-03-08 07:37:07 +01:00
Remi Collet
43da0d302b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix odbc build as shared
 2015-03-08 07:36:35 +01:00
Remi Collet
89f86119d6 Fix odbc build as shared 
Broken since a41aa46759
 2015-03-08 07:34:51 +01:00
Hugo Fonseca
baece85399 Added test for bug 69187 2015-03-07 10:53:31 +00:00
Xinchen Hui
28b408a242 Fixed bug #69198 (Compact function generate array with length but no content) 2015-03-07 16:49:07 +08:00
Anatol Belski
f1d1273f2b fix fetching wrong resource 2015-03-06 21:02:29 +01:00
Daniel Lowrey
00c35cb6a5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)

Conflicts:
	ext/openssl/openssl.c
 2015-03-06 11:31:04 -07:00
Daniel Lowrey
0928bad9ac Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly) 2015-03-06 11:29:56 -07:00
Anatol Belski
be7371f9ff fix data type 2015-03-06 16:49:08 +01: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
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