clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
96,139 Commits 491 Branches 1,363 Tags 844 MiB
464c1639ae
Commit Graph

997 Commits

Author SHA1 Message Date
Remi Collet
342acbe1c6 skip test when xml not available 2015-04-17 15:20:22 +02:00
Daniel Lowrey
4f07330e79 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

Conflicts:
	ext/openssl/xp_ssl.c
 2015-04-14 09:27:37 -06:00
Daniel Lowrey
81f356b4ae Fix Bug #69402: Reading empty SSL stream hangs until timeout 2015-04-14 09:25:11 -06:00
Daniel Lowrey
601d60a978 Fix Bug #69402: Reading empty SSL stream hangs until timeout 2015-04-14 09:24:40 -06:00
Kalle Sommer Nielsen
156ac232cb Fix test for systems where openssl's time_t have an offset set 2015-04-09 19:57:44 +02:00
Kalle Sommer Nielsen
8d3c4e5988 Fix test on systems where EOL isn't "\n", like Windows 2015-04-08 23:56:29 +02:00
Dmitry Stogov
5ba72e5f80 Fixed resource leak 2015-04-08 23:37:05 +03:00
Rasmus Lerdorf
32484e3f5f Remove SSLv3 test dependencies 
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.
 2015-04-08 09:55:55 -07:00
Eric F
321bafccde Update openssl.c 
Adding additional checks for sslv3.
 2015-03-30 01:30:09 +02:00
Leigh
456f4a78d2 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:33:22 +01:00
Leigh
a04ab4b54b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add RAND_egd check for compiling against LibreSSL
 2015-03-27 13:26:48 +01:00
Leigh
1b2d58a364 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:24:36 +01:00
Anatol Belski
19360f386e cleanup mod version macros, round 3 2015-03-23 20:54:55 +01:00
Dmitry Stogov
8633685675 Use specialized macro for string zval creation 2015-03-12 16:53:51 +03:00
Daniel Lowrey
589374d027 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Don't block on crypto data inside stream_select()
 2015-03-11 09:45:28 -06:00
Daniel Lowrey
c661121459 Don't block on crypto data inside stream_select() 2015-03-11 09:44:07 -06:00
Daniel Lowrey
4a336f5d0b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug# 69215 (Crypto servers should send client CA list)

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-10 18:18:19 -06:00
Daniel Lowrey
3f6b12795c Fix bug# 69215 (Crypto servers should send client CA list) 2015-03-10 18:13:10 -06:00
Daniel Lowrey
c5c4d22c10 Deprecate "session_meta_capture" SSL context option 
Meta data about encrypted streams is now available as part of the
"crypto" key in the array returned by stream_get_meta_data(). This
update deprecates the use of the "session_meta_capture" ssl
context option in encrypted streams.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey
2dec21634c Revert "Add stream_socket_crypto_info() function" 
This reverts commit 13acb7ec65.

With the added capability to negotiate application layer protocols
via the TLS ALPN extension userland needs a method to access the
negotiated protocol on a given stream. The reverted commit added
a new stream_socket_crypto_info() function for this purpose.

This original approach was discarded in favor of using the
already-existing stream_get_meta_data() API which specifically
exists for just such purposes and requires the addition of no new
functions.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey
676a5059b2 Add crypto info to stream_get_meta_data() result on encrypted streams 
A "crypto" key is added to the output of stream_get_meta_data() calls
when invoked using a stream on which crypto is currently active. The
new key's associated array contains the following keys:

 - protocol (string e.g. TLSv1.2, TLSv1.1, etc)
 - cipher_name (string)
 - cipher_bits (int)
 - cipher_version (string)

If the TLS ALPN extension was used to successfully negotiate an
application protocol that protocol's identifier is stored in the
following key:

 - alpn_protocol

If no ALPN protocol was negotiated the "alpn_protocol" key is not
present in the crypto meta data array. More meta information
concerning the stream's active encryption state may be added in the
future.
 2015-03-09 23:15:57 -06:00
Daniel Lowrey
748433e7bc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix crypto stream timeout regressions

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-09 16:02:04 -06:00
Daniel Lowrey
69691cc8ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix crypto stream timeout regressions
 2015-03-09 15:55:33 -06:00
Daniel Lowrey
bbfd4a5e62 Fix crypto stream timeout regressions 2015-03-09 15:53:26 -06: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
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
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
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
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
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
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
Daniel Lowrey
a39b1898fe Misc updates/cleanup 2015-03-04 09:24:27 -05:00
Daniel Lowrey
3e841470c9 Add TLS ALPN extension support in crypto client/server streams 2015-02-28 17:41:30 -05:00
Daniel Lowrey
13acb7ec65 Add stream_socket_crypto_info() function 2015-02-28 17:41:29 -05:00
Daniel Lowrey
3ff36c265f Update for OpenSSL 1.0.2 compatibility 2015-02-28 17:41:29 -05:00
Jakub Zelenka
0676f39ee4 Remove unnecessary resource checks in openssl ext 
The resource val is already checking Z_TYPE_P(val) == IS_RESOURCE.
There is no need to call extended resource fetch functions though.
 2015-02-17 20:46:36 +00:00
Xinchen Hui
10fe317300 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/openssl.c
 2015-02-16 14:18:08 +08:00
Xinchen Hui
8309988111 Fixed bug #68912 (Segmentation fault at openssl_spki_new) 2015-02-16 14:16:52 +08:00
Anatol Belski
c17e007a29 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix condition
 2015-02-13 13:40:37 +01:00
Anatol Belski
b3d28d14d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix condition
 2015-02-13 13:40:10 +01:00
Anatol Belski
5ff77b005b fix condition 2015-02-13 13:39:46 +01:00
Daniel Lowrey
712712e8d6 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-02-09 15:14:47 -05:00
Daniel Lowrey
fb2314798e Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-02-09 11:44:09 -05:00
Daniel Lowrey
1eef4f2a0c Miscellaneous cleanup 2015-02-09 11:42:17 -05:00
Brad Broerman
dddbe0fc33 Update xp_ssl.c 
Added TSRMLS_CC to php_openssl_sockop_io calls.
 2015-02-04 10:13:36 -05:00
Xinchen Hui
e98caf27ea found type is unnecessary 2015-02-02 14:45:19 +08:00
Xinchen Hui
942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
Michael Wallner
3c4540dec9 fix warnings 2015-01-30 22:49:44 +01:00
Anatol Belski
8d054be62f fix datatype mismatches, improve error checks 2015-01-30 14:36:33 +01:00
Anatol Belski
085907d168 fix datatype mismatches, improved error checks 2015-01-30 13:52:11 +01:00
Anatol Belski
3acdbaeba0 fix datatype mismatch warns, improve error check 2015-01-30 12:14:27 +01:00
Anatol Belski
397615071c make the cleanup function as static, as it's not exported 2015-01-30 11:20:25 +01:00
Anatol Belski
f6330f9912 fix datatype mismatches, add stronger error checks 2015-01-30 11:10:11 +01:00
Anatol Belski
55936775d2 fix datatype mismatches, improve error checks 2015-01-30 11:02:25 +01:00
Brad Broerman
1482ed2d56 reneg and should_close are not yet members of sslsock. Removing... 2015-01-28 22:36:41 -05:00
Anatol Belski
4d16937449 fix unportable dereferencing 2015-01-28 15:15:38 +01:00
Brad Broerman
fd4641696c Updated with SSL fixes (backported from trunk) 2015-01-28 00:04:20 -05:00
Daniel Lowrey
4965fe7fb8 Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-01-27 13:22:47 -05:00
Brad Broerman
8302d658db Quick fix 2015-01-26 21:35:35 -05:00
Brad Broerman
db49dd91bd Fixed windows infinite loop problem. 2015-01-26 20:40:52 -05:00
Dmitry Stogov
23b683c0d3 Fixed wrong size 2015-01-26 15:33:10 +03:00
Anatol Belski
ee8a0b3797 cleanup TSRMLS_* 2015-01-23 18:05:18 +01:00
Anatol Belski
647caea9f7 C89 compat 2015-01-23 15:04:29 +01:00
Daniel Lowrey
459edceea9 Merge branch 'master' of https://github.com/bbroerman30/php-src 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-01-23 01:03:39 -05:00
Brad Broerman
ebb67cd6fe Renamed timeval functions to comply with PHP naming standards 2015-01-21 10:20:32 -05:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Daniel Lowrey
80a337bba1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
  Fixed bug #55618 (use case-insensitive cert name matching)
 2015-01-14 18:04:41 +01:00
Daniel Lowrey
e2fe8e164f Fixed bug #55618 (use case-insensitive cert name matching) 2015-01-14 18:02:50 +01:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Brad Broerman
9ec7fac127 Change declaration of subtractTimeval and compareTimeval to static 2015-01-10 11:19:17 -05:00
Brad Broerman
8ded274413 Re-ordered the read and write methods to match the order of the original code, to make the DIFF easier to read. 2014-12-31 13:30:48 -05:00
Brad Broerman
fea9253c1c try to update mod 2014-12-31 10:59:57 -05:00
Brad Broerman
f22c3d643a Fixed indentation 2014-12-31 10:49:21 -05:00
Brad Broerman
49571cfad7 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	ext/openssl/xp_ssl.c
 2014-12-30 19:44:45 -05:00
Xinchen Hui
b5b617674e Micro optimaztion (yeah, I know compiler supposed to do that) 2014-12-22 00:10:46 -05:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Anatol Belski
50a93357fb Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fix perms
  fix perms
  PowerPC64 support in safe_address function
 2014-12-16 08:42:18 +01:00
Remi Collet
ee0b922ece Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix perms
 2014-12-16 08:38:29 +01:00
Remi Collet
181f34f375 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix perms
 2014-12-16 08:37:56 +01:00
Remi Collet
9c4de388c6 fix perms 2014-12-16 08:37:48 +01:00
Anatol Belski
e112f6a04e second shot on removing TSRMLS_* 2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Stanislav Malyshev
c64949626d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
  Fixes memory leak introduced in 2b9af967

Conflicts:
	ext/openssl/openssl.c
 2014-11-30 18:32:56 -08:00
Stanislav Malyshev
25e3e78016 Merge branch 'pull-request/916' 
* pull-request/916:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
 2014-11-30 18:27:37 -08:00
Stanislav Malyshev
8c08124c0e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
 2014-11-30 18:24:23 -08:00
Dominic Luechinger
6048ac32b4 Adds test cases for openssl EC improvements 2014-11-30 18:17:48 -08:00
Dominic Luechinger
5d1cc7d135 Adds better handling of EC keys: OPENSSL_KEYTYPE_EC 
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details

Conflicts:
	ext/openssl/openssl.c
 2014-11-30 18:02:55 -08:00
Anatol Belski
5f65c77e98 Merge branch 'PHP-5.6' 
* PHP-5.6:
  disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
 2014-11-28 12:25:08 +01:00
Anatol Belski
1552d6ae7b disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows 
This is using the openssl binary which, despite it's contained in the
deps, would probably miss all it's environment. It is just prone to
failure and thus is not worth it.
 2014-11-28 12:24:32 +01:00
Dominic Luechinger
17e98661c6 Adds test cases for openssl EC improvements 2014-11-24 02:31:19 +01:00
Dominic Luechinger
e795675845 Adds better handling of EC keys: OPENSSL_KEYTYPE_EC 
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details
 2014-11-24 02:04:37 +01:00
Dominic Luechinger
437ab7f1f4 Minor fix: Missing quotes in openssl test case for bug bug64802 2014-11-23 15:15:49 -08:00
Dominic Luechinger
f652ff0544 Minor fix: Missing quotes in openssl test case for bug bug64802 2014-11-23 15:15:17 -08:00
Ferenc Kovacs
d2ab6e1d15 Merge branch 'PHP-5.6' 
* PHP-5.6:
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
 2014-10-15 19:41:27 +02:00
Ferenc Kovacs
feadaaed56 Revert "Merge branch 'PHP-5.5' into PHP-5.6" 
This reverts commit 98e67add15, reversing
changes made to 2cdc1a2b74.
 2014-10-15 19:34:07 +02:00
Ferenc Kovacs
4fb998d42f Revert "fix TS build" 
This reverts commit 84a4041ba4.
 2014-10-15 19:33:47 +02:00
Ferenc Kovacs
7b8222aa44 Revert "Merge branch 'PHP-5.4' into PHP-5.5" 
This reverts commit 30a73658c6, reversing
changes made to 7fac56e072.
 2014-10-15 19:33:31 +02:00
Ferenc Kovacs
528e4166a6 Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams" 
This reverts commit f86b2193a4.
 2014-10-15 19:32:46 +02:00
Ferenc Kovacs
ff91a48f6e Revert "Bug #41631: Fix regression from first attempt (6569db8)" 
This reverts commit 372844918a.
 2014-10-15 19:32:14 +02:00
Tjerk Meesters
7e116a3baa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68234
 2014-10-15 21:13:13 +08:00
Tjerk Meesters
836a5dfddb Fixed bug #68234 
Certificate will now expire in 2034
 2014-10-15 21:12:13 +08:00
Julien Pauli
6d9c9f8f04 Revert "Bug #41631: Observe socket read timeouts in SSL streams" 
This reverts commit 6569db8808.

Conflicts:
	ext/openssl/xp_ssl.c
 2014-10-15 14:38:12 +02:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Stanislav Malyshev
408b172017 Revert xp_ssl.c to the state of 5.4.32 due to regressions 2014-09-26 00:44:24 -07:00
Ferenc Kovacs
702829dff5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update the certificate used for the test, as it expired recently
 2014-09-24 13:42:32 +02:00
Ferenc Kovacs
d27f3e7b64 update the certificate used for the test, as it expired recently 2014-09-24 13:40:52 +02:00
Remi Collet
d3bb0ba39f Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68074 Allow to use system cipher list instead of hardcoded value
 2014-09-24 10:36:58 +02:00
Remi Collet
0d776ef87b Fix bug #68074 Allow to use system cipher list instead of hardcoded value 2014-09-24 10:34:55 +02:00
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/ 
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
 2014-09-21 20:49:39 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910 
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
 2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5 Fixed useless or duplicated IS_INTERNED() checks 2014-09-19 15:41:01 +04:00
Daniel Lowrey
13695a5ead Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:25:36 -06:00
Daniel Lowrey
edb2799333 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a Bug #41631: Fix regression from first attempt (6569db8) 2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4 Bug #67965: Fix blocking behavior in non-blocking crypto streams 2014-09-09 07:37:57 -06:00
Johannes Schlüter
dadbbf8945 Fix compilation on systems without ecdh_curve 2014-08-28 00:12:48 +02:00
Anatol Belski
7d6c3e01c9 fix remaining 's' args for openssl 2014-08-28 00:05:29 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Chris Wright
0a1df74895 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:35:28 +01:00
Chris Wright
db03216e62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa 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
 2014-08-27 13:25:50 +01:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
b9514bb8fd master renames phase 6 2014-08-25 21:26:42 +02:00
Anatol Belski
5410282258 Merge branch 'master' of git.php.net:php-src 
# By Daniel Lowrey
# Via Daniel Lowrey
* 'master' of git.php.net:php-src:
  Update NEWS
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
 2014-08-25 20:23:14 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Daniel Lowrey
cc487e6cdf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
 2014-08-25 19:35:01 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Daniel Lowrey
546a32e2b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c Bug #67850: Build when OpenSSL compiled without SSLv3 support 2014-08-25 17:28:09 +02:00
Anatol Belski
1899e6f9b9 ported ext/openssl 2014-08-19 19:27:37 +02:00
Anatol Belski
97c5172ac7 Merge remote-tracking branch 'php/master' 
Conflicts:
	ext/date/lib/parse_date.c
 2014-08-19 08:27:43 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Anatol Belski
56c7b27d6b fix wrong pointer indirection 2014-08-19 07:44:03 +02:00
Dmitry Stogov
a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Dmitry Stogov
5a06ac88da cleanup (use zend_string* instead of char*) 2014-08-13 14:51:48 +04:00
Dmitry Stogov
4c716e8b51 Merge branch 'master' into test 
* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c
 2014-08-11 11:38:41 +04:00
Anatol Belski
6936c7a1bb Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix TS build
 2014-08-07 19:51:04 +02:00
Anatol Belski
8b8297170e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TS build
 2014-08-07 19:50:45 +02:00
Anatol Belski
75991561d6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TS build
 2014-08-07 19:50:25 +02:00
Anatol Belski
84a4041ba4 fix TS build 2014-08-07 19:49:59 +02:00
Daniel Lowrey
217c8edd00 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #41631: Observe socket read timeouts in SSL streams
 2014-08-07 12:17:29 -04:00
Daniel Lowrey
98e67add15 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #41631: Observe socket read timeouts in SSL streams

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-07 12:07:55 -04:00
Daniel Lowrey
5ac2e5f850 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Observe socket read timeouts in SSL streams
 2014-08-07 11:51:42 -04:00
Daniel Lowrey
6569db8808 Bug #41631: Observe socket read timeouts in SSL streams 2014-08-07 11:47:42 -04:00
Dmitry Stogov
417ed16d11 Make stream->context indirect trough zend_resource (stream->ctx->ptr). 
Fixed ext/standard/tests/streams/bug61115.phpt
 2014-08-07 15:55:37 +04:00
Dmitry Stogov
7301994c28 Merge branch 'master' into phpng 
* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
 2014-08-04 13:56:27 +04:00
Tjerk Meesters
a41a16c5cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Moved streams related functions to xp_ssl.c
 2014-07-31 12:18:19 +08:00
Tjerk Meesters
8f345a7148 Moved streams related functions to xp_ssl.c 2014-07-31 12:17:17 +08:00
Tjerk Meesters
0120a9ca4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Wildcards should only be used in the first name component; fixed comment style
 2014-07-29 19:15:20 +08:00
Tjerk Meesters
a7dad26c4b Wildcards should only be used in the first name component; fixed comment style 2014-07-29 19:15:01 +08:00
Stanislav Malyshev
f281a315f7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix NEWS
  Fix missing type checks in various functions
 2014-07-28 00:39:24 -07:00
Stanislav Malyshev
c41ca94824 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix missing type checks in various functions

Conflicts:
	ext/openssl/openssl.c
 2014-07-28 00:37:32 -07:00
Stanislav Malyshev
531be9662f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix missing type checks in various functions
 2014-07-28 00:34:27 -07:00
Stanislav Malyshev
b4a4db467b Fix missing type checks in various functions 2014-07-27 02:42:49 -07:00
Tjerk Meesters
4b41009064 Merge branch 'PHP-5.6' 2014-07-24 14:40:30 +08:00
Tjerk Meesters
38e714ece5 Fixed #67666 - Subject altName doesn't match wildcards 2014-07-24 14:36:31 +08:00
Dmitry Stogov
9583a14e75 Fixed potential memory leaks 2014-07-22 20:55:54 +04:00
Lior Kaplan
ca273c31dd ZVAL_STRINGL takes only three variables 
Follow up for commit f4cfaf36
 2014-07-22 19:38:35 +03:00
Xinchen Hui
110bf9c720 Merge remote-tracking branch 'origin/master' into phpng 
Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c
 2014-07-18 16:25:43 +08:00
Daniel Lowrey
a0cc25bbfb Merge branch 'PHP-5.6' 2014-07-16 00:15:05 -04:00
Lior Kaplan
cbcbf73fe8 Add ifdef on ecdh for single_ecdh_use 
Allows build with OpenSSL < 0.9.8
 2014-07-16 00:10:29 +03:00
Dmitry Stogov
36374ff32d Merge branch 'master' into phpng 
* master:
  skip this test which fails without network
  add missing entry to NEWS
  add missing entry to NEWS
  add NEWS block for 5.6.0RC2
  Add support for gb18030/MySQL 5.7
  Fix another problem with MySQL 5.7
  new test, missing in ea466a3
  Suppress test failure with MySQL 5.7
 2014-06-20 11:16:57 +04:00
Remi Collet
ae9db5d0a2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  skip this test which fails without network
 2014-06-20 06:45:36 +02:00
Remi Collet
e9c9169e05 skip this test which fails without network 2014-06-20 06:45:16 +02:00
Dmitry Stogov
b108267f2c Merge branch 'master' into phpng 
* master: (41 commits)
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  fix failed test
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
  Added tests for bug 67436
  Fixed wrong XFAIL test - already fixed
  Fix typo in Bug #67406 NEWS entry
  Fix typo in Bug #67406 NEWS entry
  ...

Conflicts:
	Zend/zend_compile.c
	ext/session/session.c
	ext/standard/array.c
	ext/standard/http_fopen_wrapper.c
	tests/classes/bug63462.phpt
 2014-06-18 17:50:27 +04:00
Remi Collet
6b9fa109e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
 2014-06-16 09:44:58 +02:00
Remi Collet
fc36277eb6 Fix test on modern distro where old unsecure algo are disabled in openssl config. 
Testing recent algo should be enough to check this function.
 2014-06-16 09:42:55 +02:00
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04:00
Stanislav Malyshev
f0462db11a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:20:07 -07:00
Stanislav Malyshev
3d9f922c03 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:19:50 -07:00
Stanislav Malyshev
4946dc1ab9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:19:16 -07:00
Paul Oehler
76a7fd893b Added support for parsing ssl certificates using GeneralizedTime format. 
fix bug #65698
fix bug #66636
 2014-06-08 14:17:58 -07:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov
424aebbf36 Added support for ext/openssl 2014-05-07 01:09:42 +04:00