]> granicus.if.org Git - php/log
php
12 years agoMerge branch 'PHP-5.4'
Derick Rethans [Sat, 27 Oct 2012 14:19:59 +0000 (15:19 +0100)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sat, 27 Oct 2012 14:19:55 +0000 (15:19 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years ago- Updated to version 2012.8 (2012h)
Derick Rethans [Sat, 27 Oct 2012 14:19:54 +0000 (15:19 +0100)]
- Updated to version 2012.8 (2012h)

12 years agoMerge branch 'PHP-5.4'
Dmitry Stogov [Fri, 26 Oct 2012 16:49:21 +0000 (09:49 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #63180 (Corruption of hash tables)
  fix bug #63369

Conflicts:
NEWS

12 years agoFixed bug #63180 (Corruption of hash tables)
Dmitry Stogov [Fri, 26 Oct 2012 16:47:30 +0000 (09:47 -0700)]
Fixed bug #63180 (Corruption of hash tables)

12 years agofix bug #63369
Antony Dovgal [Fri, 26 Oct 2012 12:36:47 +0000 (16:36 +0400)]
fix bug #63369

(un)serialize() leaves dangling pointers, causes crashes

12 years agofix bug #63369
Antony Dovgal [Fri, 26 Oct 2012 12:36:47 +0000 (16:36 +0400)]
fix bug #63369

(un)serialize() leaves dangling pointers, causes crashes

12 years agoMerge branch 'PHP-5.4'
Johannes Schlüter [Fri, 26 Oct 2012 12:23:22 +0000 (14:23 +0200)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Fri, 26 Oct 2012 12:22:31 +0000 (14:22 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/pdo_mysql/mysql_statement.c

12 years agoMerge branch 'PHP-5.4'
ULF WENDEL [Fri, 26 Oct 2012 10:32:39 +0000 (12:32 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  This won't make the test pass but now its at least one that shows no unnecessary error messages...

12 years agoThis won't make the test pass but now its at least one that shows no unnecessary...
ULF WENDEL [Fri, 26 Oct 2012 10:32:10 +0000 (12:32 +0200)]
This won't make the test pass but now its at least one that shows no unnecessary error messages...

12 years agoMerge branch 'PHP-5.4'
Anthony Ferrara [Thu, 25 Oct 2012 20:24:27 +0000 (16:24 -0400)]
Merge branch 'PHP-5.4'

12 years agoNews entry for CURL notice addition
Anthony Ferrara [Thu, 25 Oct 2012 20:04:56 +0000 (16:04 -0400)]
News entry for CURL notice addition

12 years agoNotice if CURLOPT_SSL_VERIFYHOST is set to true
John Jawed (JJ) [Thu, 25 Oct 2012 04:47:47 +0000 (21:47 -0700)]
Notice if CURLOPT_SSL_VERIFYHOST is set to true

12 years agoMerge in fix for bug 63363 (CURL silently accepts boolean true for SSL_VERIFYHOST
Anthony Ferrara [Thu, 25 Oct 2012 19:30:37 +0000 (15:30 -0400)]
Merge in fix for bug 63363 (CURL silently accepts boolean true for SSL_VERIFYHOST

Merge in a fix to raise a notice when a boolean true is passed into curl_setopt for CURLOPT_SSL_VERIFYHOST.

12 years agoNotice if CURLOPT_SSL_VERIFYHOST is set to true
John Jawed (JJ) [Thu, 25 Oct 2012 04:47:47 +0000 (21:47 -0700)]
Notice if CURLOPT_SSL_VERIFYHOST is set to true

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 24 Oct 2012 12:46:50 +0000 (14:46 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #63297 Phar fails to write an openssl based signature

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Wed, 24 Oct 2012 12:46:28 +0000 (14:46 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63297 Phar fails to write an openssl based signature

12 years agoFixed bug #63297 Phar fails to write an openssl based signature
Anatoliy Belsky [Wed, 24 Oct 2012 11:38:44 +0000 (13:38 +0200)]
Fixed bug #63297 Phar fails to write an openssl based signature

Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 24 Oct 2012 08:37:23 +0000 (10:37 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  enabled libxpm for gd on windows

12 years agoenabled libxpm for gd on windows
Anatoliy Belsky [Wed, 24 Oct 2012 08:36:52 +0000 (10:36 +0200)]
enabled libxpm for gd on windows

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 24 Oct 2012 08:35:52 +0000 (10:35 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  enabled libxpm for gd on windows

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Wed, 24 Oct 2012 08:35:07 +0000 (10:35 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  enabled libxpm for gd on windows

12 years agoenabled libxpm for gd on windows
Anatoliy Belsky [Wed, 24 Oct 2012 08:26:27 +0000 (10:26 +0200)]
enabled libxpm for gd on windows

12 years agoAdd missed file
Xinchen Hui [Wed, 24 Oct 2012 02:34:44 +0000 (10:34 +0800)]
Add missed file

12 years agoMerge branch 'master' of git.php.net:php-src
ULF WENDEL [Tue, 23 Oct 2012 13:14:59 +0000 (15:14 +0200)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  commented out the HHC_LOCATION line, as there are no easy to use alternatives for hhc.exe on linux. we should either run the chm build on a windows box(maybe on the replacement of oti1), or look into running it through wine see http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm for details. I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot file cannot be found.

12 years agocommented out the HHC_LOCATION line, as there are no easy to use alternatives for
Ferenc Kovacs [Thu, 25 Oct 2012 15:11:13 +0000 (17:11 +0200)]
commented out the HHC_LOCATION line, as there are no easy to use alternatives for
hhc.exe on linux.
we should either run the chm build on a windows box(maybe on the replacement of oti1),
or look into running it through wine see
http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm
for details.
I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot
file cannot be found.

12 years agoMerge branch 'PHP-5.4'
ULF WENDEL [Tue, 23 Oct 2012 13:14:45 +0000 (15:14 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix for bug #62820

12 years agoFix for bug #62820
ULF WENDEL [Tue, 23 Oct 2012 13:13:57 +0000 (15:13 +0200)]
Fix for bug #62820

12 years agoFix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this...
ULF WENDEL [Tue, 23 Oct 2012 12:58:16 +0000 (14:58 +0200)]
Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
ULF WENDEL [Tue, 23 Oct 2012 11:16:12 +0000 (13:16 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)

12 years agomerged changes for bug #63297 from 5.3
Anatoliy Belsky [Thu, 25 Oct 2012 07:40:21 +0000 (09:40 +0200)]
merged changes for bug #63297 from 5.3

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Thu, 25 Oct 2012 07:36:26 +0000 (09:36 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed a typo in the error message

12 years agofixed a typo in the error message
Anatoliy Belsky [Thu, 25 Oct 2012 07:26:44 +0000 (09:26 +0200)]
fixed a typo in the error message

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
ULF WENDEL [Tue, 23 Oct 2012 11:15:46 +0000 (13:15 +0200)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:php-src:
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows

12 years agoDeprecating undocumented function alias, related to bug #63295
ULF WENDEL [Tue, 23 Oct 2012 10:02:58 +0000 (12:02 +0200)]
Deprecating undocumented function alias, related to bug #63295

12 years agoUse if_nametoindex in Vista
Gustavo Lopes [Tue, 23 Oct 2012 09:50:56 +0000 (11:50 +0200)]
Use if_nametoindex in Vista

I missed this instance in bf19838c.

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 23 Oct 2012 09:29:28 +0000 (17:29 +0800)]
Merge branch 'PHP-5.4'

12 years agoUpdate test script
Xinchen Hui [Tue, 23 Oct 2012 09:28:52 +0000 (17:28 +0800)]
Update test script

12 years agoMerge branch 'master' of git.php.net:php-src
ULF WENDEL [Tue, 23 Oct 2012 09:18:43 +0000 (11:18 +0200)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Add missed file
  Use if_nametoindex in Vista
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)
  fix crashes in newly introduced macros when normal trace is disabled but memory traced is enabled.

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Thu, 25 Oct 2012 07:42:18 +0000 (09:42 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  merged changes for bug #63297 from 5.3

Conflicts:
NEWS

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Thu, 25 Oct 2012 07:36:44 +0000 (09:36 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fixed a typo in the error message

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 23 Oct 2012 08:36:36 +0000 (16:36 +0800)]
Merge branch 'PHP-5.4'

12 years agoTest for #63336, xfail now
Xinchen Hui [Tue, 23 Oct 2012 08:35:56 +0000 (16:35 +0800)]
Test for #63336, xfail now

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 23 Oct 2012 03:35:20 +0000 (11:35 +0800)]
Merge branch 'PHP-5.4'

12 years agoFixed bug #63305 (zend_mm_heap corrupted with traits)
Xinchen Hui [Tue, 23 Oct 2012 03:34:25 +0000 (11:34 +0800)]
Fixed bug #63305 (zend_mm_heap corrupted with traits)

12 years agoMerge branch 'master' of ssh://git.php.net/php-src
Andrey Hristov [Mon, 22 Oct 2012 12:36:16 +0000 (14:36 +0200)]
Merge branch 'master' of ssh://git.php.net/php-src

12 years agofix crashes in newly introduced macros when normal trace is disabled but
Andrey Hristov [Mon, 22 Oct 2012 12:35:35 +0000 (14:35 +0200)]
fix crashes in newly introduced macros when normal trace is disabled but
memory traced is enabled.

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
ULF WENDEL [Mon, 22 Oct 2012 11:38:02 +0000 (13:38 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src: (22 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  update NEWS
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  ...

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
ULF WENDEL [Mon, 22 Oct 2012 11:37:37 +0000 (13:37 +0200)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:php-src: (123 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Remove executable permission on inc
  Remove executable permission on phpt
  Fixed bug #63236 (Executable permission on various source files)
  ...

12 years agoMerge branch 'master' of git.php.net:php-src
ULF WENDEL [Mon, 22 Oct 2012 11:35:06 +0000 (13:35 +0200)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (27 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  updated NEWS
  update NEWS
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  add protection against core dumps if the underlying library returns 0x0 for some reason
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  ...

12 years agoMerge branch 'PHP-5.4'
Christopher Jones [Mon, 22 Oct 2012 05:22:07 +0000 (22:22 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Christopher Jones [Mon, 22 Oct 2012 05:21:46 +0000 (22:21 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoRe-fixed bug #60901 (Improve "tail" syntax for AIX installation)
Christopher Jones [Mon, 22 Oct 2012 05:17:47 +0000 (22:17 -0700)]
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)

The original fix broke Solaris installs of OCI8

12 years agoupdated NEWS
Anatoliy Belsky [Fri, 19 Oct 2012 08:02:37 +0000 (10:02 +0200)]
updated NEWS

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 19 Oct 2012 08:00:55 +0000 (10:00 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  update NEWS

12 years agoupdate NEWS
Anatoliy Belsky [Fri, 19 Oct 2012 07:58:46 +0000 (09:58 +0200)]
update NEWS

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 19 Oct 2012 07:57:17 +0000 (09:57 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  updated NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 19 Oct 2012 07:57:00 +0000 (09:57 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated NEWS

12 years agoupdated NEWS
Anatoliy Belsky [Fri, 19 Oct 2012 07:56:02 +0000 (09:56 +0200)]
updated NEWS

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 19 Oct 2012 07:52:43 +0000 (09:52 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #63284 PCRE upgrade to 8.31

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 19 Oct 2012 07:51:58 +0000 (09:51 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63284 PCRE upgrade to 8.31

12 years agoFixed bug #63284 PCRE upgrade to 8.31
Anatoliy Belsky [Fri, 19 Oct 2012 07:49:28 +0000 (09:49 +0200)]
Fixed bug #63284 PCRE upgrade to 8.31

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Fri, 19 Oct 2012 03:24:56 +0000 (11:24 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 19 Oct 2012 03:24:15 +0000 (11:24 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agopreg indenpent test script for #63055
Xinchen Hui [Fri, 19 Oct 2012 03:22:56 +0000 (11:22 +0800)]
preg indenpent test script for #63055

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Fri, 19 Oct 2012 03:17:04 +0000 (11:17 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 19 Oct 2012 03:15:03 +0000 (11:15 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoUpdate libmagic.patch
Xinchen Hui [Fri, 19 Oct 2012 03:14:14 +0000 (11:14 +0800)]
Update libmagic.patch

12 years agoMerge branch 'PHP-5.4'
Christopher Jones [Fri, 19 Oct 2012 01:55:48 +0000 (18:55 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Add fix & missing fix

12 years agoAdd fix & missing fix
Christopher Jones [Fri, 19 Oct 2012 01:55:15 +0000 (18:55 -0700)]
Add fix & missing fix

12 years agoMerge branch 'PHP-5.4'
Christopher Jones [Fri, 19 Oct 2012 01:53:22 +0000 (18:53 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Add fix & missing fix

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Christopher Jones [Fri, 19 Oct 2012 01:51:40 +0000 (18:51 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Add fix & missing fix

12 years agoAdd fix & missing fix
Christopher Jones [Fri, 19 Oct 2012 01:50:18 +0000 (18:50 -0700)]
Add fix & missing fix

12 years agoMerge branch 'PHP-5.4'
Christopher Jones [Fri, 19 Oct 2012 00:58:36 +0000 (17:58 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Christopher Jones [Fri, 19 Oct 2012 00:57:19 +0000 (17:57 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)

12 years agoFixed bug #63307 (Unused variable in oci8.c)
Christopher Jones [Fri, 19 Oct 2012 00:53:00 +0000 (17:53 -0700)]
Fixed bug #63307 (Unused variable in oci8.c)

An output section for oci_internal_debug() was setting but not using a variable

12 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 19 Oct 2012 00:40:15 +0000 (17:40 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src: (75 commits)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  add protection against core dumps if the underlying library returns 0x0 for some reason
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems
  fix newly introduced segfault
  Fixed bug #63248 Load multiple magic files on win
  Cover have_ssl=NO and have_ssl=DISABLED
  Updating expected output in anticipation of mysqlnd_auth.c path
  updated NEWS
  Refactor to using a stack based zval instead of dynamic allocation
  ...

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 19 Oct 2012 00:37:49 +0000 (17:37 -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: (22 commits)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Fixed bug #63248 Load multiple magic files on win
  Cover have_ssl=NO and have_ssl=DISABLED
  - BFN
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
  ...

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Fri, 19 Oct 2012 00:37:21 +0000 (17:37 -0700)]
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Cover have_ssl=NO and have_ssl=DISABLED
  Minor changes for MySQL 5.6
  NEWS for 76601c4
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10

12 years agoFixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
Christopher Jones [Fri, 19 Oct 2012 00:33:51 +0000 (17:33 -0700)]
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)

Improve high availability for explicitly terminated connections.

12 years agoMerge branch 'PHP-5.4'
Derick Rethans [Thu, 18 Oct 2012 20:53:08 +0000 (21:53 +0100)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Thu, 18 Oct 2012 20:53:04 +0000 (21:53 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years ago- Updated to version 2012.7 (2012g)
Derick Rethans [Thu, 18 Oct 2012 20:53:03 +0000 (21:53 +0100)]
- Updated to version 2012.7 (2012g)

12 years agoMerge branch 'PHP-5.4'
Derick Rethans [Thu, 18 Oct 2012 16:54:03 +0000 (17:54 +0100)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Thu, 18 Oct 2012 16:53:55 +0000 (17:53 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
Zend/acinclude.m4

12 years agoSUpport newer bisons.
Derick Rethans [Thu, 18 Oct 2012 16:53:21 +0000 (17:53 +0100)]
SUpport newer bisons.

12 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Thu, 18 Oct 2012 15:34:12 +0000 (23:34 +0800)]
Merge branch 'master' of git.php.net:php-src

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Thu, 18 Oct 2012 15:33:25 +0000 (23:33 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 15:32:48 +0000 (23:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoMerge the fix for #61964 to 5.3, which will fix #63304
Xinchen Hui [Thu, 18 Oct 2012 15:29:33 +0000 (23:29 +0800)]
Merge the fix for #61964 to 5.3, which will fix #63304

12 years agoMerge branch 'master' of ssh://git.php.net/php-src
Andrey Hristov [Thu, 18 Oct 2012 13:15:32 +0000 (15:15 +0200)]
Merge branch 'master' of ssh://git.php.net/php-src

12 years agoadd protection against core dumps if the underlying library returns
Andrey Hristov [Thu, 18 Oct 2012 13:09:17 +0000 (15:09 +0200)]
add protection against core dumps if the underlying library returns
0x0 for some reason

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Thu, 18 Oct 2012 12:14:54 +0000 (20:14 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 12:13:36 +0000 (20:13 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoindent
Xinchen Hui [Thu, 18 Oct 2012 12:13:14 +0000 (20:13 +0800)]
indent

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Thu, 18 Oct 2012 12:12:00 +0000 (20:12 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 12:11:32 +0000 (20:11 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agobetter fix for #63055
Xinchen Hui [Thu, 18 Oct 2012 12:10:35 +0000 (20:10 +0800)]
better fix for #63055

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Thu, 18 Oct 2012 09:35:29 +0000 (17:35 +0800)]
Merge branch 'PHP-5.4'