Commit Graph

76258 Commits

Author SHA1 Message Date
Levi Morrison
73c44d6e6a Fixed assumption that the temporary directory is located in /tmp 2013-10-11 22:18:07 +02: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
Christopher Jones
71a3c07843 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).
2013-10-10 11:15:12 -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
Christopher Jones
3979b8b9c4 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)
2013-10-09 09:41:12 -07:00
Christopher Jones
f859b8d2cf 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.
2013-10-09 09:41:01 -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
5f41cb18be 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)
2013-10-09 10:06:45 +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
Michael Wallner
1815942f53 Thanks Daniel, I didn't think long enough 2013-10-09 08:22:33 +02:00
Michael Wallner
cfa4eced9f Merge branch 'PHP-5.5'
* PHP-5.5:
  consolidate NEWS with 5.4
2013-10-09 08:16:23 +02:00
Michael Wallner
e3c7b48709 consolidate NEWS with 5.4 2013-10-09 08:16:00 +02:00
Christopher Jones
c0bcedafbc 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
  ...
2013-10-08 10:21:42 -07:00
Christopher Jones
fe650a43ed Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix bug #51076 (race condition in shtool's mkdir -p)
2013-10-08 10:21:10 -07:00
Daniel Lowrey
1970b96443 Added SAN matching during peer verification 2013-10-08 12:37:44 -04:00
Michael Wallner
cf6413ae7c openssl NEWS,UPGRADING 2013-10-08 16:20:07 +02: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
Michael Wallner
b15765412a Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #51076 (race condition in shtool's mkdir -p)
2013-10-08 08:37:44 +02:00
Michael Wallner
f32d2ac3aa fix bug #51076 (race condition in shtool's mkdir -p) 2013-10-08 08:37:08 +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
ArunSK
b5a0f12871 fixing a minor typo in CODING_STANDARDS document 2013-10-07 00:26:49 +02: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
3e023c3ddf Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (705 commits)
  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.
  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
  Fix bug #65821: By-ref foreach on property access of string offset segfaults
  Fixed bug #64230 (XMLReader does not suppress errors)
  add NEWS and UPGRADING about gost-crypto
  fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
  typo: really fix bug #51936 	Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  Fix Bug #60633 build warning in bcmath
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
  OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  ...
2013-10-05 17:57:23 -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