]> granicus.if.org Git - php/log
php
11 years agoPHP 5.5.2 has already branched
Christopher Jones [Mon, 5 Aug 2013 23:03:22 +0000 (16:03 -0700)]
PHP 5.5.2 has already branched

11 years agoDoh. PHP 5.5 NEWS needs own commit.
Christopher Jones [Mon, 5 Aug 2013 22:56:46 +0000 (15:56 -0700)]
Doh. PHP 5.5 NEWS needs own commit.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Mon, 5 Aug 2013 22:40:56 +0000 (15:40 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.

11 years agoNEWS for recent DTrace merges.
Christopher Jones [Mon, 5 Aug 2013 22:38:36 +0000 (15:38 -0700)]
NEWS for recent DTrace merges.
Remove redundant 'cp' during DTrace install.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Mon, 5 Aug 2013 22:35:46 +0000 (15:35 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

Conflicts:
Makefile.global

11 years agoFixed bug #62691 (solaris sed has no -i switch)
Christopher Jones [Wed, 31 Jul 2013 16:58:28 +0000 (09:58 -0700)]
Fixed bug #62691 (solaris sed has no -i switch)
Make 'make distclean' remove generated DTrace .h file

11 years agoEnable dtrace probes on linux as they are compatible with systemtap
David Soria Parra [Mon, 3 Dec 2012 11:21:32 +0000 (12:21 +0100)]
Enable dtrace probes on linux as they are compatible with systemtap

You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.

11 years agoFixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
Remi Collet [Sun, 16 Dec 2012 07:51:17 +0000 (08:51 +0100)]
Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Mon, 5 Aug 2013 21:27:54 +0000 (14:27 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

Conflicts:
ext/mysqlnd/mysqlnd.c

11 years agoAdd an empty make command for DTrace .d files to stop an implicit
Christopher Jones [Mon, 5 Aug 2013 21:21:06 +0000 (14:21 -0700)]
Add an empty make command for DTrace .d files to stop an implicit
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)

11 years agoMerge branch 'PHP-5.4'
Kalle Sommer Nielsen [Mon, 5 Aug 2013 15:23:00 +0000 (17:23 +0200)]
Merge branch 'PHP-5.4'

11 years agoMerge branch 'PHP-5.5'
Kalle Sommer Nielsen [Mon, 5 Aug 2013 15:16:05 +0000 (17:16 +0200)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Mon, 5 Aug 2013 09:24:07 +0000 (18:24 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.

11 years agoFixed bug #62978. pg_select()/etc may allow SQL injection when table name is user...
Yasuo Ohgaki [Mon, 5 Aug 2013 09:23:15 +0000 (18:23 +0900)]
Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.

11 years agoadd news about session fix
Stanislav Malyshev [Mon, 5 Aug 2013 03:04:42 +0000 (20:04 -0700)]
add news about session fix

11 years agoMerge branch 'pr368' into PHP-5.5
Stanislav Malyshev [Mon, 5 Aug 2013 03:00:28 +0000 (20:00 -0700)]
Merge branch 'pr368' into PHP-5.5

* pr368:
  fix crash, enable session_id and fix test
  Strict session. Detect session id collision
  Strict session

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 5 Aug 2013 02:36:01 +0000 (19:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  First fixes for a 64bit compatible ftp extension

11 years agoFirst fixes for a 64bit compatible ftp extension
Andreas Streichardt [Fri, 12 Oct 2012 09:02:33 +0000 (11:02 +0200)]
First fixes for a 64bit compatible ftp extension

11 years agofix compiler warning, use longs for hashes
Stanislav Malyshev [Mon, 5 Aug 2013 01:04:45 +0000 (18:04 -0700)]
fix compiler warning, use longs for hashes

11 years agofix crash, enable session_id and fix test
Stanislav Malyshev [Mon, 5 Aug 2013 00:43:20 +0000 (17:43 -0700)]
fix crash, enable session_id and fix test

11 years agoStrict session. Detect session id collision
Yasuo Ohgaki [Tue, 25 Jun 2013 11:09:10 +0000 (20:09 +0900)]
Strict session. Detect session id collision

11 years agoStrict session
Yasuo Ohgaki [Tue, 25 Jun 2013 10:47:04 +0000 (19:47 +0900)]
Strict session

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 4 Aug 2013 23:06:24 +0000 (16:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  non living code related typo fixes

Conflicts:
Zend/zend_compile.c

11 years agonon living code related typo fixes
Veres Lajos [Tue, 23 Jul 2013 23:55:43 +0000 (00:55 +0100)]
non living code related typo fixes

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 4 Aug 2013 23:02:53 +0000 (16:02 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo

11 years agofix typo
Stanislav Malyshev [Wed, 31 Jul 2013 05:23:05 +0000 (22:23 -0700)]
fix typo

11 years agoThis doesn't fail in 5.5 anymore
Rasmus Lerdorf [Sat, 3 Aug 2013 16:14:47 +0000 (12:14 -0400)]
This doesn't fail in 5.5 anymore

11 years agoMerge commit 'a03f094' into PHP-5.5
Rasmus Lerdorf [Fri, 2 Aug 2013 20:23:44 +0000 (16:23 -0400)]
Merge commit 'a03f094' into PHP-5.5

* commit 'a03f094':
  We shouldn't load any local ini files for these tests

11 years agoWe shouldn't load any local ini files for these tests
Rasmus Lerdorf [Fri, 2 Aug 2013 20:23:18 +0000 (16:23 -0400)]
We shouldn't load any local ini files for these tests

11 years agoMerge commit 'd60e168' into PHP-5.5
Rasmus Lerdorf [Fri, 2 Aug 2013 20:13:03 +0000 (16:13 -0400)]
Merge commit 'd60e168' into PHP-5.5

* commit 'd60e168':
  pcre_quote? No such thing. How did this ever pass?

11 years agopcre_quote? No such thing. How did this ever pass?
Rasmus Lerdorf [Fri, 2 Aug 2013 20:12:21 +0000 (16:12 -0400)]
pcre_quote? No such thing. How did this ever pass?

11 years agoMerge commit 'ea75b1b' into PHP-5.5
Rasmus Lerdorf [Fri, 2 Aug 2013 19:33:40 +0000 (15:33 -0400)]
Merge commit 'ea75b1b' into PHP-5.5

* commit 'ea75b1b':
  This test needs local infile enabled

11 years agoThis test needs local infile enabled
Rasmus Lerdorf [Fri, 2 Aug 2013 19:33:18 +0000 (15:33 -0400)]
This test needs local infile enabled

11 years agoMerge commit 'e55f08a' into PHP-5.5
Rasmus Lerdorf [Fri, 2 Aug 2013 16:01:12 +0000 (12:01 -0400)]
Merge commit 'e55f08a' into PHP-5.5

* commit 'e55f08a':
  This test will only work if gc is enabled

11 years agoThis test will only work if gc is enabled
Rasmus Lerdorf [Fri, 2 Aug 2013 16:00:48 +0000 (12:00 -0400)]
This test will only work if gc is enabled

11 years agoMerge commit '5753b74' into PHP-5.5
Rasmus Lerdorf [Fri, 2 Aug 2013 15:47:52 +0000 (11:47 -0400)]
Merge commit '5753b74' into PHP-5.5

* commit '5753b74':
  Make sure test.php isn't coming in from the include_path

11 years agoMake sure test.php isn't coming in from the include_path
Rasmus Lerdorf [Fri, 2 Aug 2013 15:47:12 +0000 (11:47 -0400)]
Make sure test.php isn't coming in from the include_path

11 years agoFixed tests (inet_pton behaves differently on Darwin)
Xinchen Hui [Fri, 2 Aug 2013 10:43:08 +0000 (18:43 +0800)]
Fixed tests (inet_pton behaves differently on Darwin)

11 years agoUpdate NEWS
Xinchen Hui [Fri, 2 Aug 2013 10:39:41 +0000 (18:39 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 2 Aug 2013 10:39:18 +0000 (18:39 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
Xinchen Hui [Fri, 2 Aug 2013 10:37:15 +0000 (18:37 +0800)]
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Fri, 2 Aug 2013 00:52:50 +0000 (09:52 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add user contributed test. Bug #61748

11 years agoAdd user contributed test. Bug #61748
Yasuo Ohgaki [Fri, 2 Aug 2013 00:52:08 +0000 (09:52 +0900)]
Add user contributed test. Bug #61748

11 years agoClean up the 'generated' phar.inc file.
Christopher Jones [Thu, 1 Aug 2013 16:19:53 +0000 (09:19 -0700)]
Clean up the 'generated' phar.inc file.
When building outside the source tree the copied phar.inc needs to be removed,
but when building in the tree, the file must remain since it is part of the source.
See the copying logic in ext/phar/Makefile.frag.

11 years agoRevert "Allow 'make distclean' to clean up the 'generated' phar.inc"
Christopher Jones [Thu, 1 Aug 2013 15:47:13 +0000 (08:47 -0700)]
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"

This reverts commit 017145bc57e604153f2a2400dd6e73a397f52f96.

11 years agoUse PHP's major version when cleaning up Apache .module files
Christopher Jones [Wed, 31 Jul 2013 19:35:10 +0000 (12:35 -0700)]
Use PHP's major version when cleaning up Apache .module files

11 years agoMerge branch 'phardistclean' into PHP-5.5
Christopher Jones [Wed, 31 Jul 2013 19:34:28 +0000 (12:34 -0700)]
Merge branch 'phardistclean' into PHP-5.5

* phardistclean:
  Allow 'make distclean' to clean up the 'generated' phar.inc

11 years agoAllow 'make distclean' to clean up the 'generated' phar.inc
Christopher Jones [Wed, 31 Jul 2013 19:31:50 +0000 (12:31 -0700)]
Allow 'make distclean' to clean up the 'generated' phar.inc

11 years agoGive 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection...
Christopher Jones [Wed, 31 Jul 2013 18:49:29 +0000 (11:49 -0700)]
Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.

11 years agoFixed bug #62691 (solaris sed has no -i switch)
Christopher Jones [Wed, 31 Jul 2013 16:58:28 +0000 (09:58 -0700)]
Fixed bug #62691 (solaris sed has no -i switch)
Make 'make distclean' remove generated DTrace .h file

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Wed, 31 Jul 2013 16:01:56 +0000 (09:01 -0700)]
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:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed php-5.2 support
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Added support for glob symbols in blacklist entries (?, *, **)
  Fixed bug #65336

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Wed, 31 Jul 2013 16:01:54 +0000 (09:01 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 31 Jul 2013 13:37:08 +0000 (17:37 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)

11 years agoImproved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Dmitry Stogov [Wed, 31 Jul 2013 13:36:06 +0000 (17:36 +0400)]
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 31 Jul 2013 12:34:26 +0000 (16:34 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
NEWS

11 years agoFixed bug #65018 (SoapHeader problems with SoapServer)
Dmitry Stogov [Wed, 31 Jul 2013 12:32:26 +0000 (16:32 +0400)]
Fixed bug #65018 (SoapHeader problems with SoapServer)

11 years agoAdded opcache.restrict_api configuration directive that may limit usage of OPcahce...
Dmitry Stogov [Wed, 31 Jul 2013 10:20:56 +0000 (14:20 +0400)]
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)

11 years agoMFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Rui Hirokawa [Tue, 30 Jul 2013 23:46:54 +0000 (08:46 +0900)]
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Tue, 30 Jul 2013 23:24:04 +0000 (03:24 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

11 years agoFixed php-5.2 support
Dmitry Stogov [Tue, 30 Jul 2013 23:22:34 +0000 (03:22 +0400)]
Fixed php-5.2 support

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Rui Hirokawa [Tue, 30 Jul 2013 23:18:51 +0000 (08:18 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoadded test script for bug65045.
Rui Hirokawa [Tue, 30 Jul 2013 23:18:39 +0000 (08:18 +0900)]
added test script for bug65045.

11 years agoMFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Rui Hirokawa [Tue, 30 Jul 2013 23:17:15 +0000 (08:17 +0900)]
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Tue, 30 Jul 2013 23:04:48 +0000 (03:04 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:

11 years agoAdded support for glob symbols in blacklist entries (?, *, **)
Dmitry Stogov [Tue, 30 Jul 2013 23:01:19 +0000 (03:01 +0400)]
Added support for glob symbols in blacklist entries (?, *, **)

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Tue, 30 Jul 2013 20:39:20 +0000 (13:39 -0700)]
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:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)

11 years agoImproved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
Dmitry Stogov [Tue, 30 Jul 2013 18:31:37 +0000 (22:31 +0400)]
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)

11 years agoA minor fix for configure outpu (Tony)
Dmitry Stogov [Tue, 30 Jul 2013 18:03:21 +0000 (22:03 +0400)]
A minor fix for configure outpu (Tony)

11 years agoFixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Dmitry Stogov [Tue, 30 Jul 2013 13:35:19 +0000 (17:35 +0400)]
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

11 years agoMerge from GitHub
Dmitry Stogov [Sun, 28 Jul 2013 09:47:13 +0000 (13:47 +0400)]
Merge from GitHub

11 years agoUpdate NEWS
Yasuo Ohgaki [Fri, 26 Jul 2013 20:51:30 +0000 (05:51 +0900)]
Update NEWS

11 years agoFixed bug #65336
Yasuo Ohgaki [Fri, 26 Jul 2013 20:46:11 +0000 (05:46 +0900)]
Fixed bug #65336

11 years agoFixed bug #65336
Yasuo Ohgaki [Fri, 26 Jul 2013 20:46:11 +0000 (05:46 +0900)]
Fixed bug #65336

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 25 Jul 2013 17:57:47 +0000 (10:57 -0700)]
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:

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 25 Jul 2013 17:57:46 +0000 (10:57 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 25 Jul 2013 17:42:45 +0000 (10:42 -0700)]
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:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 25 Jul 2013 17:42:43 +0000 (10:42 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Upper section name
  Fixed bug #65328 (Segfault when getting SplStack object Value)

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 25 Jul 2013 15:53:29 +0000 (08:53 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
  fix missing include
  Fix bug 65299
  Fix compiler warning on redefined constant
  Fix comment
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 25 Jul 2013 15:53:26 +0000 (08:53 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Xinchen Hui (2) and others
# Via Stanislav Malyshev (1) and Xinchen Hui (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Upper section name
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Fix compiler warning on redefined constant
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 25 Jul 2013 14:45:44 +0000 (22:45 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoUpper section name
Xinchen Hui [Thu, 25 Jul 2013 14:45:15 +0000 (22:45 +0800)]
Upper section name

11 years agoUpdate NEWs
Xinchen Hui [Thu, 25 Jul 2013 14:44:59 +0000 (22:44 +0800)]
Update NEWs

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 25 Jul 2013 14:44:19 +0000 (22:44 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65328 (Segfault when getting SplStack object Value)
Xinchen Hui [Thu, 25 Jul 2013 14:43:41 +0000 (22:43 +0800)]
Fixed bug #65328 (Segfault when getting SplStack object Value)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 24 Jul 2013 04:44:54 +0000 (21:44 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'bug65028' into PHP-5.4
Stanislav Malyshev [Wed, 24 Jul 2013 04:44:06 +0000 (21:44 -0700)]
Merge branch 'bug65028' into PHP-5.4

* bug65028:
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoExpand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
Adam Harvey [Tue, 23 Jul 2013 18:15:43 +0000 (11:15 -0700)]
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.

On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.

Fixes the fix for bug #61697.

11 years agofix missing include
Anatol Belski [Tue, 23 Jul 2013 16:06:51 +0000 (18:06 +0200)]
fix missing include

11 years agoFix bug 65299
Johannes Schlüter [Tue, 23 Jul 2013 12:13:22 +0000 (14:13 +0200)]
Fix bug 65299

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Tue, 23 Jul 2013 10:57:08 +0000 (12:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix compiler warning on redefined constant
Johannes Schlüter [Tue, 23 Jul 2013 10:50:37 +0000 (12:50 +0200)]
Fix compiler warning on redefined constant

11 years agoFix comment
Johannes Schlüter [Tue, 23 Jul 2013 10:41:24 +0000 (12:41 +0200)]
Fix comment

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 23 Jul 2013 08:00:07 +0000 (10:00 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt

11 years agofixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
Anatol Belski [Tue, 23 Jul 2013 07:59:08 +0000 (09:59 +0200)]
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Mon, 22 Jul 2013 17:59:01 +0000 (10:59 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
  fixed possible null deref
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Properly fixed bug #63186 on NetBSD == 6.0
  ...

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 22 Jul 2013 17:58:57 +0000 (10:58 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Anatol Belski (8) and others
# Via Anatol Belski (2) and others
* 'PHP-5.4' of https://git.php.net/repository/php-src: (44 commits)
  fixed possible null deref
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Fixed bug #65304 (Use of max int in array_sum)
  Reorder NEWS
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Properly fixed bug #63186 on NetBSD == 6.0
  Improve php.ini-* documentation
  5.4.19 is next
  Fixed bug #50308 - session id not appended properly for empty anchor tags
  Fix bug #62129 - rfc1867 crashes php even though turned off
  add news for xml fix
  fix TS build
  added sapi check for dl() test
  Make zval2myslqnd implementations aware of inheritance
  Fixed typo ensuring header str is \0 terminated
  fix buffer overrun
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  ...

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 22 Jul 2013 12:51:11 +0000 (14:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed possible null deref

11 years agofixed possible null deref
Anatol Belski [Mon, 22 Jul 2013 12:50:18 +0000 (14:50 +0200)]
fixed possible null deref

11 years agofix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific...
Stanislav Malyshev [Mon, 22 Jul 2013 07:56:45 +0000 (00:56 -0700)]
fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 22 Jul 2013 06:14:42 +0000 (23:14 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock