Commit Graph

32867 Commits

Author SHA1 Message Date
Daniel Lowrey
2aaa3d538a Added support for TLSv1.1 and TLSv1.2
Conflicts:
	ext/openssl/xp_ssl.c
2013-10-17 14:49:44 +02:00
Michael Wallner
bd666e2f99 Merge branch 'PHP-5.5'
* PHP-5.5:
  Assume the free space is correct on Travis CI.
2013-10-17 12:12:26 +02:00
Tjerk Meesters
51b809e3ad Assume the free space is correct on Travis CI. 2013-10-17 12:12:05 +02:00
Christopher Jones
89e93bd2a2 OCI8: More test updates 2013-10-16 22:33:34 -07:00
Christopher Jones
0d909f5bfc OCI8: Mostly SKIPIF version updates to simplify version checks at the expense of not testing some edge cases with older Oracle patch set versions.
Delete two obsolete .phpt's.
2013-10-16 22:02:32 -07:00
Xinchen Hui
a1a7522105 Merge branch 'PHP-5.5' 2013-10-17 12:25:01 +08:00
Xinchen Hui
06994a419d Add ability of alias resolving (it cause problem while work with opcache) 2013-10-17 12:23:09 +08:00
Paul Tarjan
a2eacd8a2c fix typo in copy_variation16 test 2013-10-14 23:54:59 -07:00
Anatol Belski
dcfd753104 fixed skeleton to produce the normalized ext version macros
See http://news.php.net/php.pecl.dev/11191 for more info.
2013-10-14 14:37:39 +02:00
Anatol Belski
2c9fc139fe Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed skeleton to produce the normalized ext version macros
2013-10-14 14:21:46 +02:00
Anatol Belski
7a038ccbe6 fixed skeleton to produce the normalized ext version macros
See http://news.php.net/php.pecl.dev/11191 for more info.
2013-10-14 14:18:43 +02:00
Jakub Zelenka
c092d286fc Fix compiler warnings in openssl.c 2013-10-13 15:52:39 +01:00
Daniel Lowrey
9d57243794 Fixes broken zts build (recent openssl changes) 2013-10-12 22:28:15 +02:00
Felipe Pena
0ca4b6c083 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed resource leak
2013-10-12 17:25:37 -03:00
Felipe Pena
5c6dbc35e7 - Fixed resource leak 2013-10-12 17:25:26 -03:00
Levi Morrison
7f3b5b77cc Standardized usage of zpp_none and the order of the comparison zpp(...) == FAILURE 2013-10-11 10:32:40 -06:00
Christopher Jones
5ae8c51e68 OCI8: sync README and package.xml descriptions 2013-10-10 13:38:38 -07:00
Dmitry Stogov
a2aa6a3440 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).

Conflicts:
	NEWS
2013-10-10 15:33:17 +04:00
Dmitry Stogov
ef8cf76815 Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled). 2013-10-10 15:32:30 +04:00
Christopher Jones
141c2cb97a Re-enable OCI8 DLL builds with Oracle 10g & 11g client libraries on
Windows, in addition to Oracle 12c.  From discussions with Anatol &
Pierre this seems to be the most direct way for the Windows PECL build
scripts to automatically create links to the generated DLLs.  The
issue is that the name php_oci8_12c.dll doesn't match the package
name.

In the far future when php_oci8.dll (with Oracle 10g) is no longer
built then another Windows PECL packaging fix will be needed.
2013-10-09 12:17:11 -07:00
Michael Wallner
e2d123a720 C89 2013-10-09 17:16:25 +02:00
Michael Wallner
c85c50e35c Merge branch 'san_peer_matching' of https://github.com/rdlowrey/php-src
* 'san_peer_matching' of https://github.com/rdlowrey/php-src:
  Changed return types to zend_bool, renamed test
  Added SAN matching during peer verification
2013-10-09 17:09:03 +02:00
Daniel Lowrey
a40dd6e963 Changed return types to zend_bool, renamed test 2013-10-09 09:55:36 -04:00
Michael Wallner
302b9d4e5c Merge branch 'PHP-5.5'
* PHP-5.5:
  C89 compatibility
2013-10-09 12:30:51 +02:00
Michael Wallner
3b3c57e79e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  C89 compatibility
2013-10-09 12:30:42 +02:00
Michael Wallner
22700890d4 C89 compatibility 2013-10-09 12:30:31 +02:00
Michael Wallner
29d5ff75d5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed segfault when built with OpenSSL >= 1.0.1
  fixing a minor typo in CODING_STANDARDS document
  FIX BUG #65219 - Typo correction
  FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:18:29 +02:00
Michael Wallner
36fb4ed968 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed segfault when built with OpenSSL >= 1.0.1
  fixing a minor typo in CODING_STANDARDS document
  FIX BUG #65219 - Typo correction
  FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:17:48 +02:00
Daniel Lowrey
b026993a74 Fixed segfault when built with OpenSSL >= 1.0.1
(PR #481)
2013-10-09 09:17:25 +02:00
Daniel Lowrey
2ddefbd2b3 Added support for TLSv1.1 and TLSv1.2 2013-10-08 14:09:17 -04:00
Daniel Lowrey
1970b96443 Added SAN matching during peer verification 2013-10-08 12:37:44 -04:00
Michael Wallner
ea0578e223 Merge branch 'ssl-streams-crypto-method' of https://github.com/mj/php-src
* 'ssl-streams-crypto-method' of https://github.com/mj/php-src:
  Add unit test that covers setting the crypto method.
  Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
2013-10-08 16:10:00 +02:00
Michael Wallner
8300ced2f7 Merge branch 'bug65729' of https://github.com/datibbaw/php-src
* 'bug65729' of https://github.com/datibbaw/php-src:
  DNS name comparison is now case insensitive.
  Use zend_bool as return value for _match()
  Added two more test cases for CN matching.
  yay, reduced one variable
  Fixed bug that would lead to out of bounds memory access
  added better wildcard matching for CN
2013-10-08 15:58:28 +02:00
Michael Wallner
0d8c83a251 Merge branch 'openssl-x509-digest' of https://github.com/datibbaw/php-src
* 'openssl-x509-digest' of https://github.com/datibbaw/php-src:
  Using SUCCESS and FAILURE for return values Using zend_bool for boolean arguments and return values Reduced one level of zval indirection where possible
  show method in error message
  Support string and array for peer fingerprint matching
  who put that stupid newline there?
  add md5 and sha1 fingerprint tests
  Renamed to be more descriptive of what it does
  don't leak cert on errors, return null on zpp failure
  Added test case for openssl_x509_digest()
  removed the byref result
  indentation fail
  added option for hash function
  added option for raw output
  added openssl_x509_digest(), output is binary sha1
2013-10-08 15:57:18 +02:00
Michael Wallner
5d430ad902 fix bad cast 2013-10-08 11:16:53 +02:00
datibbaw
6106896440 DNS name comparison is now case insensitive. 2013-10-08 10:07:54 +08:00
Christopher Jones
f0863fa43a Add new tests to package.xml 2013-10-07 17:38:56 -07:00
Christopher Jones
1675fd2277 Add new tests 2013-10-07 17:26:00 -07:00
Christopher Jones
12f9939b79 Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle
client library 10.2 (Note this will connect to Oracle Database 8.1.7
onwards). Use the older OCI8 1.4 from PECL if using an earlier PHP
version or older Oracle client library support is necessary.
2013-10-07 17:23:11 -07:00
Tjerk Meesters
39c0daeb71 Use zend_bool as return value for _match() 2013-10-07 23:04:24 +08:00
Tjerk Meesters
674dd73f8c Added two more test cases for CN matching. 2013-10-07 22:10:05 +08:00
Anatol Belski
4fe7ec33f1 Merge branch 'PHP-5.5'
* PHP-5.5:
  added fixed tests for ICU >= 51.2
  fixed failing tests for ICU >= 51.2
  FIX BUG #65219 - Typo correction
  FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
  - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
  - BFN
2013-10-07 13:50:59 +02:00
Anatol Belski
0117eb747e added fixed tests for ICU >= 51.2 2013-10-07 13:49:55 +02:00
Anatol Belski
4840b0a749 fixed failing tests for ICU >= 51.2 2013-10-07 13:49:10 +02:00
datibbaw
955bc1d91b Using SUCCESS and FAILURE for return values
Using zend_bool for boolean arguments and return values
Reduced one level of zval indirection where possible
2013-10-07 15:38:48 +08:00
Stanley Sufficool
fa40290fb7 FIX BUG #65219 - Typo correction 2013-10-05 21:00:47 -07:00
Stanley Sufficool
63f242178d FIX BUG #65219 - Typo correction 2013-10-05 20:59:20 -07:00
Stanley Sufficool
9c7dbb0487 Fix bug #64338 pdo_dblib can't connect to Azure SQL 2013-10-05 18:26:25 -07:00
Stanley Sufficool
5ce23f39d5 FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
FreeTDS <0.92 does not support DBSETLDBNAME option and therefore
will not work with SQL Azure. Fallback to dbuse command in
letter versions.
2013-10-05 10:06:42 -07:00
Stanley Sufficool
d74b9cfee5 Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src:
  - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
  - BFN
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future
  Fixed bug #64230 (XMLReader does not suppress errors)
  typo: really fix bug #51936 	Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #65322: compile time errors won't trigger auto loading
  5.4.20 release date
  Add information about which INI file is which inside respective files
  - Updated to version 2013.6 (2013f)
2013-10-05 09:57:13 -07:00
Stanley Sufficool
690bbe170d FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
FreeTDS <0.92 does not support DBSETLDBNAME option and therefore
will not work with SQL Azure. Fallback to dbuse command in
letter versions.
2013-10-05 09:54:45 -07:00
Christopher Jones
3261eb348f Merge branch 'PHP-5.5'
* PHP-5.5:
  Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired.  Note the implementations differ so you will see different ldap behavior.
2013-10-04 15:51:39 -07:00
Christopher Jones
5bc377457e Allow the ldap extension to be compiled with Oracle's LDAP
implementation, if desired.  Note the implementations differ so you
will see different ldap behavior.

The patch allows configuration similar to:
--with-ldap=$HOME/instantclient --with-oci8=instantclient,$HOME/instantclient

The patch doesn't support configuration similar to:
--with-ldap --with-oci8=instantclient,$HOME/instantclient
since this would try and mix the default LDAP and Oracle LDAP
implementations.

This patch closes out bug #61450 and the associated github PR.

Regardless of this patch, my recommended way to install both OCI8 and
ldap extensions is to statically configure PHP with ldap, and then add
OCI8 as a shared extension from PECL.
2013-10-04 15:50:16 -07:00
Martin Jansen
047877e810 Add unit test that covers setting the crypto method. 2013-10-04 21:55:29 +02:00
Nikita Popov
44a2ae059e Merge branch 'PHP-5.5' 2013-10-04 17:27:22 +02:00
Nikita Popov
90f0a77cad Merge branch 'PHP-5.4' into PHP-5.5 2013-10-04 17:26:35 +02:00
Philip Hofstetter
96cc419924 Fix bug #65667: ftp_nb_continue produces segfault
the idea behind ftp_nb_get is for it to be followed by multiple calls
to ftp_nb_continue in order to download a file piece-by-piece.

As such, it's unwise to close the stream used to write the downloaded
data to when the file hasn't been completely downloaded within the first
call to ftp_nb_get.

This regression was added in a93a462dce
and this patch restores the behavior that was seen pre-patch.
2013-10-04 17:25:46 +02:00
Michael Wallner
f72ed22749 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:46 +02:00
Michael Wallner
d72a4d1634 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:37 +02:00
Michael Wallner
8973390541 fix bug #64146 (serialize incorrectly saving objects when they are
cloned)
2013-10-04 16:16:15 +02:00
Michael Wallner
39022ba227 Merge branch 'PHP-5.5'
* PHP-5.5:
  such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:41 +02:00
Michael Wallner
adfb5ab7ce Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:23 +02:00
Michael Wallner
e8ae795529 such a weird hack probably helps in finding regressions in the future 2013-10-04 16:11:49 +02:00
Michael Wallner
e13e5b17ff Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 11:22:52 +02:00
Michael Wallner
2e2bda3508 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 11:22:43 +02:00
Michael Wallner
f6ff3a28d6 Fixed bug #64230 (XMLReader does not suppress errors) 2013-10-04 11:22:17 +02:00
Michael Wallner
05f847da45 Merge PR #430 gost-crypto
Merge branch 'master' of github.com:manuelm/php-src

* 'master' of github.com:manuelm/php-src:
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST
2013-10-03 16:20:00 +02:00
Michael Wallner
c7b1d76eb9 fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency 2013-10-03 15:23:05 +02:00
Michael Wallner
2a1bd123d6 Merge branch 'PHP-5.5'
* PHP-5.5:
  typo: really fix bug #51936 	Crash with clone xmlreader
2013-10-03 13:35:09 +02:00
Michael Wallner
92fd085ebf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  typo: really fix bug #51936 	Crash with clone xmlreader
2013-10-03 13:35:00 +02:00
Michael Wallner
dc3d360a0f typo: really fix bug #51936 Crash with clone xmlreader 2013-10-03 13:34:31 +02:00
Michael Wallner
95fd508dfa Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #59613 (Crash with clone XMLReader)
2013-10-03 13:30:02 +02:00
Michael Wallner
86f2b33629 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #59613 (Crash with clone XMLReader)
2013-10-03 13:29:18 +02:00
Michael Wallner
fc3f8a8f54 fix bug #59613 (Crash with clone XMLReader) 2013-10-03 13:28:41 +02:00
Remi Collet
99598fd873 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix Bug #60633 build warning in bcmath
2013-10-03 08:45:40 +02:00
Remi Collet
60d9175280 Fix Bug #60633 build warning in bcmath 2013-10-03 08:45:31 +02:00
Michael Wallner
bc16dfda1f Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now
2013-10-02 15:56:09 +02:00
Michael Wallner
2ba3926815 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now

Conflicts:
	configure.in
	ext/sockets/sockets.c
	main/php_version.h
2013-10-02 15:55:38 +02:00
Michael Wallner
9209c19f8f fix bug #65808 the socket_connect() won't work with IPv6 address 2013-10-02 15:19:25 +02:00
Michael Wallner
d29a01de3f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #61548

Conflicts:
	ext/standard/http_fopen_wrapper.c
2013-10-01 11:11:48 +02:00
Michael Wallner
ad139d9a00 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #61548
2013-10-01 11:08:20 +02:00
Michael Wallner
18b04b480e Fixed bug #61548 2013-10-01 11:07:55 +02:00
Christopher Jones
954a0f8bf4 OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
Currently this code is #ifdef'd out, since I can't consider the feature stable until an Oracle-side fix for Oracle bug 16695981 is available.  Having the code available in PHP OCI8 facilitates testing of any fix.
2013-09-30 16:51:07 -07:00
Tjerk Meesters
e45eacd8fa show method in error message 2013-09-30 21:21:56 +08:00
Michael Wallner
6757033355 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix test
  fix memleak on resetting rebind_proc
2013-09-30 14:05:37 +02:00
Michael Wallner
d4d6a95105 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test
  fix memleak on resetting rebind_proc
2013-09-30 14:04:48 +02:00
Michael Wallner
2b78edfba2 fix test 2013-09-30 11:41:35 +02:00
Michael Wallner
e9e63f9223 fix memleak on resetting rebind_proc 2013-09-30 11:23:33 +02:00
Christopher Jones
0a3ee7b26b Prepare for next release 2013-09-27 17:16:02 -07:00
Christopher Jones
9b9eaba083 OCI8: Fix alloc function and DLL generation 2013-09-27 17:00:41 -07:00
Dmitry Stogov
56eee05f66 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed references to "Zend Support"
2013-09-27 14:02:01 +04:00
Dmitry Stogov
80346690ba Removed references to "Zend Support" 2013-09-27 14:01:07 +04:00
Dmitry Stogov
3eba8cf673 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added support for GNU Hurd. (Svante Signell)

Conflicts:
	NEWS
2013-09-27 13:44:31 +04:00
Dmitry Stogov
f904830012 Added support for GNU Hurd. (Svante Signell) 2013-09-27 13:43:25 +04:00
Derick Rethans
9ef4e5d23d Merge branch 'PHP-5.5' 2013-09-27 10:14:51 +01:00
Derick Rethans
ea0f832f10 Merge branch 'PHP-5.4' into PHP-5.5 2013-09-27 10:14:47 +01:00
Derick Rethans
7a1a1aec8c - Updated to version 2013.6 (2013f) 2013-09-27 10:14:46 +01:00
datibbaw
edd93f3452 Support string and array for peer fingerprint matching 2013-09-27 14:13:11 +08:00
Christopher Jones
5ac7c533a0 More OCI8 DTrace probe updates.
Change php.ini-* doc to match an earlier change to config.w32
2013-09-26 21:12:11 -07:00
Stanley Sufficool
577b10b214 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
2013-09-26 20:16:28 -07:00
Stanley Sufficool
ac05cfb499 FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver 2013-09-26 19:53:47 -07:00
Sara Golemon
92fe33c570 Merge branch 'pull-request/473' 2013-09-26 13:24:08 -07:00
Nikita Popov
0d7a638866 Implement variadic function syntax
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
ptarjan
361e984e46 fix missing change from 'tcp_socket' to the more common 'server' 2013-09-26 01:06:36 -07:00
ptarjan
ecbe4af0de fix many parallel test issues
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-09-26 00:30:23 -07:00
Dmitry Stogov
6daa04a4f6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.

Conflicts:
	NEWS
2013-09-25 12:15:01 +04:00
Dmitry Stogov
69454d9f0f Added function opcache_compile_file() to load PHP scripts into cache without execution. 2013-09-25 12:14:06 +04:00
Dmitry Stogov
4e249c8a93 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

Conflicts:
	NEWS
2013-09-25 11:04:03 +04:00
Dmitry Stogov
dc8705c256 Fixed issue #135 (segfault in interned strings if initial memory is too low) 2013-09-25 11:02:39 +04:00
Tjerk Meesters
69bdc5aca8 who put that stupid newline there? 2013-09-23 23:42:31 +08:00
Tjerk Meesters
1c7cabb2ca add md5 and sha1 fingerprint tests 2013-09-23 23:29:17 +08:00
Adam Harvey
859b708722 Merge branch 'PHP-5.5'
* PHP-5.5:
  Copy dba_*() keys before converting to string.
2013-09-22 16:54:12 -07:00
Adam Harvey
a92a350cce Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Copy dba_*() keys before converting to string.
2013-09-22 16:52:41 -07:00
Adam Harvey
30e0442c54 Copy dba_*() keys before converting to string.
A nice Sunday afternoon project for somebody would be to refactor the dba
functions to use zend_parse_parameters() reliably and try to untangle some of
the macros in dba.c. Sadly, it is not a nice Sunday afternoon here.

Fixes bug #65708 (dba functions cast $key param to string in-place, bypassing
copy on write).
2013-09-22 16:46:17 -07:00
Tjerk Meesters
2bfc5a253b Renamed to be more descriptive of what it does 2013-09-23 00:51:17 +08:00
Martin Jansen
ce2789558a Streams for ssl:// transports can now be configured to use a specific
crypto method (SSLv3, SSLv2 etc.) by calling

stream_context_set_option($ctx, "ssl", "crypto_method", $crypto_method)

where $crypto_method can be one of STREAM_CRYPTO_METHOD_SSLv2_CLIENT,
STREAM_CRYPTO_METHOD_SSLv3_CLIENT, STREAM_CRYPTO_METHOD_SSLv23_CLIENT
or STREAM_CRYPTO_METHOD_TLS_CLIENT. SSLv23 remains the default crypto
method.

This change makes it possible to fopen() SSL URLs that are only
provided using SSL v3.
2013-09-21 21:26:40 +02:00
Tjerk Meesters
a820c3d6ba yay, reduced one variable 2013-09-21 20:42:52 +08:00
Tjerk Meesters
8e847b5845 Fixed bug that would lead to out of bounds memory access 2013-09-21 19:38:09 +08:00
Tjerk Meesters
521a5c9568 don't leak cert on errors, return null on zpp failure 2013-09-21 18:24:00 +08:00
Tjerk Meesters
8915c3fb4f added better wildcard matching for CN 2013-09-21 16:45:20 +08:00
Adam Harvey
9e3bedcd73 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 14:21:28 -07:00
Adam Harvey
3f64d35559 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 14:19:01 -07:00
Adam Harvey
cc66eaa04b Fix the broken sh syntax in ext/imap/config.m4.
Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).
2013-09-20 14:15:19 -07:00
Tjerk Meesters
a97aec16c0 Added test case for openssl_x509_digest() 2013-09-20 23:29:04 +08:00
Tjerk Meesters
574fe449dc removed the byref result 2013-09-20 22:50:30 +08:00
datibbaw
ce13f9fa32 indentation fail 2013-09-20 16:59:44 +08:00
datibbaw
b2881db9a9 added option for hash function 2013-09-20 16:56:50 +08:00
datibbaw
5cff92fb12 added option for raw output 2013-09-20 15:45:41 +08:00
datibbaw
b8f9a20286 added openssl_x509_digest(), output is binary sha1 2013-09-20 15:04:52 +08:00
Christopher Jones
b6d0cb0553 Build OCI8 2.0 on Windows with Oracle Database 12c libraries only 2013-09-18 19:50:32 -07:00
David Soria Parra
dc7015d4e4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:58 +02:00
David Soria Parra
94e4c4df86 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:51 +02:00
David Soria Parra
7a24ee13ec Revert "EmptyIterator now implements Countable; fixes bug 60577"
This reverts commit 8a936e8eb9.
2013-09-18 15:06:36 +02:00
David Soria Parra
58c6e05748 Merge branch 'PHP-5.5'
* PHP-5.5:
  RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:29:02 +02:00
David Soria Parra
2eb5661886 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:28:57 +02:00
David Soria Parra
7e9044b6a2 RFC 6598 reserved ip range starts at 100.64.0.0 2013-09-18 14:27:58 +02:00
Chris Wright
0d534d7c5e Add ldap_escape() 2013-09-18 12:18:05 +01:00
Michael Wallner
cdf5d201ab fix test concurrency 2013-09-18 11:02:45 +02:00
Michael Wallner
e9877fe92e fix test concurrency 2013-09-18 10:53:11 +02:00
Michael Wallner
14d5341787 fix test concurrency 2013-09-18 10:52:51 +02:00
Michael Wallner
6866b45a48 fix test concurrency 2013-09-18 10:52:35 +02:00
Michael Wallner
002763fb7b fix test concurrency 2013-09-18 10:52:18 +02:00
Michael Wallner
e6084da473 final bits 2013-09-17 13:59:49 +02:00
Michael Wallner
423c70fb4d Merge branch 'slim-postdata-merge'
* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
	ext/soap/soap.c
	ext/standard/php_fopen_wrapper.c
	main/SAPI.c
2013-09-17 13:52:25 +02:00
Michael Wallner
0f78d8612a we need to use the full stream wrapper for filters 2013-09-17 13:44:50 +02:00
Anatol Belski
41d78110ff let the libsqlite3 symbols be exported in dll 2013-09-17 13:05:44 +02:00
Michael Wallner
1c15d70cbd Merge branch 'slim-postdata'
* slim-postdata:
  slim post data
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
David Soria Parra
52ff129607 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
2013-09-17 09:55:59 +02:00
David Soria Parra
5e3da04fb0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
2013-09-17 09:55:03 +02:00
Sebastian Nohn
7c279df6ae Add RFC 6598 IPs to reserved addresses
(cherry picked from commit b3f5b822e9)
2013-09-17 09:52:53 +02:00