]> granicus.if.org Git - php/log
php
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 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 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 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 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 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' 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 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.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 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 agoUpdate test script
Xinchen Hui [Tue, 23 Oct 2012 09:28:52 +0000 (17:28 +0800)]
Update test script

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 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 '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 '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 agoupdate NEWS
Anatoliy Belsky [Fri, 19 Oct 2012 07:58:46 +0000 (09:58 +0200)]
update 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.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.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.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 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.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.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 '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.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.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 '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 '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.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.3' into PHP-5.4
Xinchen Hui [Thu, 18 Oct 2012 09:32:48 +0000 (17:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
Xinchen Hui [Thu, 18 Oct 2012 09:31:27 +0000 (17:31 +0800)]
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)

12 years agoI forgot that inconsistent is only avaliable in debug mode
Xinchen Hui [Thu, 18 Oct 2012 08:33:07 +0000 (16:33 +0800)]
I forgot that inconsistent is only avaliable in debug mode

12 years agoAdd comments
Xinchen Hui [Thu, 18 Oct 2012 08:06:20 +0000 (16:06 +0800)]
Add comments

12 years agoFixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
Xinchen Hui [Thu, 18 Oct 2012 07:49:37 +0000 (15:49 +0800)]
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)

This should also fixed various segfaults which the bt looks like cored in zval_mark_grey

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 17 Oct 2012 16:26:27 +0000 (18:26 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoPHP 5.3.18 NEWS
Johannes Schlüter [Wed, 17 Oct 2012 16:25:40 +0000 (18:25 +0200)]
PHP 5.3.18 NEWS

12 years agofix NEWS
Andrey Hristov [Wed, 17 Oct 2012 15:56:17 +0000 (17:56 +0200)]
fix NEWS

12 years agoMerge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
Andrey Hristov [Wed, 17 Oct 2012 15:23:37 +0000 (17:23 +0200)]
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3

12 years agofix compilation failure on 32/64bit linux systems, when libmysql is used
Andrey Hristov [Wed, 17 Oct 2012 15:22:31 +0000 (17:22 +0200)]
fix compilation failure on 32/64bit linux systems, when libmysql is used
 with ext/mysql

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 11 Oct 2012 00:28:35 +0000 (17:28 -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:
  Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
  Fix warnings preventing this test from passing
  Remove executable permission on inc

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Thu, 11 Oct 2012 00:28:31 +0000 (17:28 -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:
  Remove executable permission on inc

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Wed, 10 Oct 2012 09:24:09 +0000 (17:24 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

12 years agoImplemented FR #63242 (Default error page in PHP built-in web server uses outdated...
Xinchen Hui [Wed, 10 Oct 2012 09:23:30 +0000 (17:23 +0800)]
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)

12 years agoFix warnings preventing this test from passing
Anatoliy Belsky [Wed, 10 Oct 2012 09:01:07 +0000 (11:01 +0200)]
Fix warnings preventing this test from passing

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 10 Oct 2012 02:45:07 +0000 (10:45 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoRemove executable permission on inc
Xinchen Hui [Wed, 10 Oct 2012 02:44:34 +0000 (10:44 +0800)]
Remove executable permission on inc

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Wed, 10 Oct 2012 02:37:06 +0000 (19: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:
  Remove executable permission on phpt
  Remove executable permission on phpt

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Wed, 10 Oct 2012 02:37:02 +0000 (19: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:
  Remove executable permission on phpt

12 years agoRemove executable permission on phpt
Xinchen Hui [Wed, 10 Oct 2012 02:31:53 +0000 (10:31 +0800)]
Remove executable permission on phpt

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 10 Oct 2012 02:31:31 +0000 (10:31 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoRemove executable permission on phpt
Xinchen Hui [Wed, 10 Oct 2012 02:27:49 +0000 (10:27 +0800)]
Remove executable permission on phpt

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Tue, 9 Oct 2012 05:51:58 +0000 (22:51 -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:
  Fixed bug #63236 (Executable permission on various source files)
  Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Tue, 9 Oct 2012 05:51:54 +0000 (22:51 -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:
  Fixed bug #63236 (Executable permission on various source files)
  Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 9 Oct 2012 05:29:51 +0000 (13:29 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63236 (Executable permission on various source files)
Xinchen Hui [Tue, 9 Oct 2012 05:28:31 +0000 (13:28 +0800)]
Fixed bug #63236 (Executable permission on various source files)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 9 Oct 2012 05:14:31 +0000 (13:14 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
Xinchen Hui [Tue, 9 Oct 2012 05:13:51 +0000 (13:13 +0800)]
Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 8 Oct 2012 23:13:07 +0000 (16:13 -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: (45 commits)
  Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
  exposing the libxpm version in phpinfo
  5.4.9-dev
  PHP-5.3 branch is 5.3.19 now
  reverted the previous fix for libpng include
  fixed include checks for libpng under win
  Avoding superfluous function call
  Add test for #35895
  Now we can set the tsrm_ls manually
  Fixed bug #63184  test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
  add news for --offline
  add --offline option to run-tests command
  Bug #63147: SKIP_ONLINE_TESTS, for getmxrr
  Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
  gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
  add bug #63162
  fix test and move to proper place
  synergy ftl. Removed duplicate fields.
  adding test phpt
  Bug #63162 - parse_url does not matches password component
  ...

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Mon, 8 Oct 2012 23:13:03 +0000 (16:13 -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:
  exposing the libxpm version in phpinfo
  PHP-5.3 branch is 5.3.19 now
  reverted the previous fix for libpng include
  fixed include checks for libpng under win
  Avoding superfluous function call
  Add test for #35895
  Update NEWS
  FD_ZERO file descriptors before calling curl_multi_fdset
  Fixed bug #62216
  - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - add missing php-fpm.service.in
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
  - Updated to version 2012.6 (2012f)
  - Updated to version 2012.5 (2012e)
  - Updated to version 2012.4 (2012d)

12 years agoFixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
Xinchen Hui [Mon, 8 Oct 2012 14:59:52 +0000 (22:59 +0800)]
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Thu, 4 Oct 2012 16:21:07 +0000 (18:21 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  exposing the libxpm version in phpinfo

12 years agoexposing the libxpm version in phpinfo
Anatoliy Belsky [Thu, 4 Oct 2012 16:20:02 +0000 (18:20 +0200)]
exposing the libxpm version in phpinfo

12 years agoMerge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Derick Rethans [Thu, 4 Oct 2012 07:39:34 +0000 (08:39 +0100)]
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Derick Rethans [Thu, 4 Oct 2012 07:39:21 +0000 (08:39 +0100)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

12 years ago5.4.9-dev
Stanislav Malyshev [Thu, 4 Oct 2012 01:36:17 +0000 (18:36 -0700)]
5.4.9-dev

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 4 Oct 2012 00:37:04 +0000 (02:37 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

12 years agoPHP-5.3 branch is 5.3.19 now
Johannes Schlüter [Thu, 4 Oct 2012 00:35:42 +0000 (02:35 +0200)]
PHP-5.3 branch is 5.3.19 now

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 2 Oct 2012 08:00:09 +0000 (10:00 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  reverted the previous fix for libpng include

12 years agoreverted the previous fix for libpng include
Anatoliy Belsky [Tue, 2 Oct 2012 07:57:44 +0000 (09:57 +0200)]
reverted the previous fix for libpng include

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 2 Oct 2012 07:40:42 +0000 (09:40 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed include checks for libpng under win

12 years agofixed include checks for libpng under win
Anatoliy Belsky [Tue, 2 Oct 2012 07:39:34 +0000 (09:39 +0200)]
fixed include checks for libpng under win

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 1 Oct 2012 16:30:49 +0000 (00:30 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoAvoding superfluous function call
Xinchen Hui [Mon, 1 Oct 2012 16:28:38 +0000 (00:28 +0800)]
Avoding superfluous function call

12 years agoAdd test for #35895
Xinchen Hui [Mon, 1 Oct 2012 16:27:35 +0000 (00:27 +0800)]
Add test for #35895

12 years agoNow we can set the tsrm_ls manually
Xinchen Hui [Mon, 1 Oct 2012 16:02:08 +0000 (00:02 +0800)]
Now we can set the tsrm_ls manually

get(ZTS build):
(gdb) zbacktrace
You can't do that without a process to debug.
(gdb) set_ts 0x4112500
(gdb) zbacktrace
[0x2b232e83a1d8] call_user_func(array(2)[0x2b232e879528],
array(1)[0x2b232e878fa0]) /tmp/1.php:4
[0x7fffcb2efd80] A->__call("xxx", array(1)[0x2b232e878fa0])