Commit Graph

76440 Commits

Author SHA1 Message Date
Nikita Popov
865f221627 Merge branch 'PHP-5.4' into PHP-5.5 2013-10-16 18:37:49 +02:00
bwoebi
4c0bb6d76e 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.
2013-10-16 18:33:14 +02:00
Julien Pauli
aa76f779ef 5.5.6 now 2013-10-15 16:11:11 +02:00
Paul Tarjan
a2eacd8a2c fix typo in copy_variation16 test 2013-10-14 23:54:59 -07:00
Anatol Belski
eb97d270da Merge branch 'PHP-5.5'
* PHP-5.5:
  fix whitespaces
2013-10-14 17:13:30 +02:00
Anatol Belski
7e4a42c278 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix whitespaces
2013-10-14 17:13:11 +02:00
Anatol Belski
b0a36007ab fix whitespaces 2013-10-14 17:12:32 +02:00
Anatol Belski
2a093551e7 Merge branch 'PHP-5.5'
* PHP-5.5:
  added notes about the PECL site conformity

Conflicts:
	README.EXTENSIONS
2013-10-14 16:10:10 +02:00
Anatol Belski
78cbe9aed5 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  added notes about the PECL site conformity
2013-10-14 16:08:21 +02:00
Anatol Belski
9ccde8a415 added notes about the PECL site conformity 2013-10-14 16:07:26 +02: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
ea4ef75918 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed skeleton to produce the normalized ext version macros
2013-10-14 14:34:33 +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
Felipe Pena
314a3aa9ac Merge branch 'master' of git.php.net:/php-src 2013-10-12 18:07:58 -03:00
Felipe Pena
eed5d9cc5f Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible memory leak
2013-10-12 18:06:39 -03:00
Felipe Pena
62a8305007 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible memory leak
2013-10-12 18:06:27 -03:00
Felipe Pena
960b4e81f3 - Fixed possible memory leak 2013-10-12 18:06:20 -03: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
Felipe Pena
54a595a091 Merge branch 'master' of git.php.net:/php-src 2013-10-12 17:05:20 -03:00
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
Christopher Jones
ef7fd7f4b5 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).
2013-10-10 11:14:22 -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
Christopher Jones
9fbfdb3396 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
2013-10-09 09:40:54 -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
Daniel Lowrey
2ddefbd2b3 Added support for TLSv1.1 and TLSv1.2 2013-10-08 14:09:17 -04: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