Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
TLS news
previous revert killed that file
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
fix ws
Added support for TLSv1.1 and TLSv1.2
Added support for TLSv1.1 and TLSv1.2
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
Added support for TLSv1.1 and TLSv1.2
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.
bwoebi [Wed, 16 Oct 2013 14:04:23 +0000 (16:04 +0200)]
Fixed bug #65911 ($this not usable as static property)
In context of static accesses like classname::$this, the string
"$this" should not be handled like a $this variable, but as an
identifier for a static variable.
Merge branch 'master' of https://git.php.net/repository/php-src
# By Dmitry Stogov
# Via Christopher Jones (2) and Dmitry Stogov (2)
* 'master' of https://git.php.net/repository/php-src:
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Dmitry Stogov
# Via Dmitry Stogov
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
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.
Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (4) and others
# Via Michael Wallner (8) and Stanley Sufficool (1)
* 'master' of https://git.php.net/repository/php-src:
C89
Changed return types to zend_bool, renamed test
C89 compatibility
Fixed segfault when built with OpenSSL >= 1.0.1
Thanks Daniel, I didn't think long enough
consolidate NEWS with 5.4
Added SAN matching during peer verification
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.
run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Michael Wallner (2) and others
# Via Michael Wallner (3) and Stanley Sufficool (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
C89 compatibility
Fixed segfault when built with OpenSSL >= 1.0.1
consolidate NEWS with 5.4
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.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Daniel Lowrey (1) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
C89 compatibility
Fixed segfault when built with OpenSSL >= 1.0.1
Michael Wallner [Wed, 9 Oct 2013 15:09:03 +0000 (17:09 +0200)]
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
Michael Wallner [Wed, 9 Oct 2013 08:06:45 +0000 (10:06 +0200)]
Merge branch 'issue-55736' of https://github.com/tistre/php-src
implements FR #55736
* 'issue-55736' of https://github.com/tistre/php-src:
run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
Michael Wallner [Wed, 9 Oct 2013 07:18:29 +0000 (09:18 +0200)]
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.
Michael Wallner [Wed, 9 Oct 2013 07:17:48 +0000 (09:17 +0200)]
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.
Merge branch 'master' of https://git.php.net/repository/php-src
# By Tjerk Meesters (12) and others
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src: (24 commits)
openssl NEWS,UPGRADING
fix bad cast
fix bug #51076 (race condition in shtool's mkdir -p)
DNS name comparison is now case insensitive.
Use zend_bool as return value for _match()
Added two more test cases for CN matching.
Using SUCCESS and FAILURE for return values Using zend_bool for boolean arguments and return values Reduced one level of zval indirection where possible
Add unit test that covers setting the crypto method.
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
Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
yay, reduced one variable
Fixed bug that would lead to out of bounds memory access
don't leak cert on errors, return null on zpp failure
added better wildcard matching for CN
Added test case for openssl_x509_digest()
removed the byref result
...
Michael Wallner [Tue, 8 Oct 2013 14:10:00 +0000 (16:10 +0200)]
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
Michael Wallner [Tue, 8 Oct 2013 13:58:28 +0000 (15:58 +0200)]
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
Michael Wallner [Tue, 8 Oct 2013 13:57:18 +0000 (15:57 +0200)]
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
projects / php / log