]> granicus.if.org Git - php/log
php
11 years agoFix phar phpinfo test after markup changes
Nikita Popov [Sat, 3 Aug 2013 14:32:02 +0000 (16:32 +0200)]
Fix phar phpinfo test after markup changes

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

* 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'
Rasmus Lerdorf [Fri, 2 Aug 2013 20:13:12 +0000 (16:13 -0400)]
Merge commit 'd60e168'

* 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'
Rasmus Lerdorf [Fri, 2 Aug 2013 19:33:49 +0000 (15:33 -0400)]
Merge commit 'ea75b1b'

* 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'
Rasmus Lerdorf [Fri, 2 Aug 2013 16:01:20 +0000 (12:01 -0400)]
Merge commit 'e55f08a'

* 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'
Rasmus Lerdorf [Fri, 2 Aug 2013 15:48:07 +0000 (11:48 -0400)]
Merge commit '5753b74'

* 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 agofix generating config.nice
Michael Wallner [Fri, 2 Aug 2013 11:09:06 +0000 (13:09 +0200)]
fix generating config.nice

Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice

* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments

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

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 agoMerge branch 'PHP-5.5'
Xinchen Hui [Fri, 2 Aug 2013 10:39:58 +0000 (18:39 +0800)]
Merge branch 'PHP-5.5'

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.5'
Yasuo Ohgaki [Fri, 2 Aug 2013 00:54:51 +0000 (09:54 +0900)]
Merge branch 'PHP-5.5'

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

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 agoMerge branch 'PHP-5.5'
Christopher Jones [Thu, 1 Aug 2013 16:22:47 +0000 (09:22 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  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 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 agoMerge branch 'PHP-5.5'
Christopher Jones [Thu, 1 Aug 2013 15:49:19 +0000 (08:49 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"

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 agoMerge branch 'PHP-5.5'
Christopher Jones [Wed, 31 Jul 2013 19:36:20 +0000 (12:36 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Use PHP's major version when cleaning up Apache .module files
  Allow 'make distclean' to clean up the 'generated' phar.inc

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 agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Wed, 31 Jul 2013 19:02:23 +0000 (12:02 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Constify streams API and a few other calls down the rabbit hole. (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.

11 years agoClean generated OCI8 DTrace files in 'make distclean'
Christopher Jones [Wed, 31 Jul 2013 19:01:35 +0000 (12:01 -0700)]
Clean generated OCI8 DTrace files in 'make distclean'

11 years agoMerge branch 'PHP-5.5'
Christopher Jones [Wed, 31 Jul 2013 18:50:57 +0000 (11:50 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.

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 agoMerge branch 'PHP-5.5'
Christopher Jones [Wed, 31 Jul 2013 17:00:05 +0000 (10:00 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file

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 'master' of https://git.php.net/repository/php-src
Christopher Jones [Wed, 31 Jul 2013 16:02:06 +0000 (09:02 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' 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.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.5'
Dmitry Stogov [Wed, 31 Jul 2013 13:37:27 +0000 (17:37 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  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 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.5'
Dmitry Stogov [Wed, 31 Jul 2013 12:35:09 +0000 (16:35 +0400)]
Merge branch 'PHP-5.5'

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

Conflicts:
NEWS

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 agoMerge branch 'PHP-5.5'
Dmitry Stogov [Wed, 31 Jul 2013 10:24:30 +0000 (14:24 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

Conflicts:
NEWS

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 agoMerge branch 'pull-request/399'
Sara Golemon [Wed, 31 Jul 2013 07:49:30 +0000 (00:49 -0700)]
Merge branch 'pull-request/399'

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 agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 30 Jul 2013 23:23:10 +0000 (03:23 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed php-5.2 support

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 agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 30 Jul 2013 23:04:22 +0000 (03:04 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 30 Jul 2013 23:04:00 +0000 (03:04 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added support for glob symbols in blacklist entries (?, *, **)

Conflicts:
NEWS

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 'master' of https://git.php.net/repository/php-src
Christopher Jones [Tue, 30 Jul 2013 20:39:29 +0000 (13:39 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' 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 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 agoRemove tabs on blanklines in Makefile sources. This prevents a
Christopher Jones [Tue, 30 Jul 2013 20:36:10 +0000 (13:36 -0700)]
Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing & saving Makefile using Emacs.

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 30 Jul 2013 18:33:46 +0000 (22:33 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)

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 agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 30 Jul 2013 18:04:55 +0000 (22:04 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  A minor fix for configure outpu (Tony)

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 agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 30 Jul 2013 13:36:47 +0000 (17:36 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
NEWS

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 agoConstify streams API and a few other calls down the rabbit hole.
Andrey Hristov [Tue, 30 Jul 2013 10:49:36 +0000 (12:49 +0200)]
Constify streams API and a few other calls down the rabbit hole.
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.

11 years agomake simplexml headers available to the outta world
Anatol Belski [Mon, 29 Jul 2013 20:18:55 +0000 (22:18 +0200)]
make simplexml headers available to the outta world

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Sun, 28 Jul 2013 09:50:13 +0000 (13:50 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
NEWS

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

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

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 agoOCI8 extension: Allow Implicit Result Set statement resources to inherit the parent...
Christopher Jones [Fri, 26 Jul 2013 20:34:45 +0000 (13:34 -0700)]
OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 26 Jul 2013 18:34:21 +0000 (11:34 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fix --enable-maintainer-zts mode in OCI8 2.0

11 years agoFix --enable-maintainer-zts mode in OCI8 2.0
Christopher Jones [Thu, 25 Jul 2013 23:15:32 +0000 (16:15 -0700)]
Fix --enable-maintainer-zts mode in OCI8 2.0

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

* 'master' of https://git.php.net/repository/php-src:
  Update UPGRADING and make typo fixes to OCI8 package.xml

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 agoUpdate UPGRADING and make typo fixes to OCI8 package.xml
Christopher Jones [Thu, 25 Jul 2013 17:54:03 +0000 (10:54 -0700)]
Update UPGRADING and make typo fixes to OCI8 package.xml

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

* 'master' 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.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 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 25 Jul 2013 15:53:33 +0000 (08:53 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Johannes Schlüter (3) and others
# Via Johannes Schlüter (4) and others
* 'master' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Initial PHP OCI8 2.0.0-dev commit.
  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.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.5'
Xinchen Hui [Thu, 25 Jul 2013 14:46:21 +0000 (22:46 +0800)]
Merge branch 'PHP-5.5'

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)

12 years agoMerge branch 'oci8_20'
Christopher Jones [Wed, 24 Jul 2013 22:36:57 +0000 (15:36 -0700)]
Merge branch 'oci8_20'

* oci8_20:
  Initial PHP OCI8 2.0.0-dev commit.

12 years agoInitial PHP OCI8 2.0.0-dev commit.
Christopher Jones [Wed, 24 Jul 2013 22:33:22 +0000 (15:33 -0700)]
Initial PHP OCI8 2.0.0-dev commit.

Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.

See package.xml for details.

12 years agoMerge branch 'PHP-5.5'
Stanislav Malyshev [Wed, 24 Jul 2013 04:46:23 +0000 (21:46 -0700)]
Merge branch 'PHP-5.5'

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

12 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

12 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

12 years agoMerge branch 'PHP-5.5'
Adam Harvey [Tue, 23 Jul 2013 18:19:02 +0000 (11:19 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.