]> granicus.if.org Git - php/log
php
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'

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 agoMerge branch 'PHP-5.4'
Xinchen Hui [Thu, 18 Oct 2012 08:33:48 +0000 (16:33 +0800)]
Merge branch 'PHP-5.4'

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 agoMerge branch 'PHP-5.4'
Xinchen Hui [Thu, 18 Oct 2012 08:06:47 +0000 (16:06 +0800)]
Merge branch 'PHP-5.4'

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

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

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 'master' of git.php.net:/php-src
Johannes Schlüter [Wed, 17 Oct 2012 16:27:40 +0000 (18:27 +0200)]
Merge branch 'master' of git.php.net:/php-src

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

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 agofix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems
Andrey Hristov [Wed, 17 Oct 2012 14:35:36 +0000 (16:35 +0200)]
fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems

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

12 years agofix newly introduced segfault
Andrey Hristov [Tue, 16 Oct 2012 13:06:02 +0000 (15:06 +0200)]
fix newly introduced segfault

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

* 'master' 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.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'
Xinchen Hui [Wed, 10 Oct 2012 09:24:40 +0000 (17:24 +0800)]
Merge branch 'PHP-5.4'

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 agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 10 Oct 2012 09:06:34 +0000 (11:06 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix warnings preventing this test from passing

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.4'
Xinchen Hui [Wed, 10 Oct 2012 02:45:34 +0000 (10:45 +0800)]
Merge branch 'PHP-5.4'

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 'master' of https://git.php.net/repository/php-src
Christopher Jones [Wed, 10 Oct 2012 02:37:10 +0000 (19:37 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Remove executable permission on phpt
  Remove executable permission on phpt
  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 [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:32:58 +0000 (10:32 +0800)]
Remove executable permission on phpt

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

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 'master' of https://git.php.net/repository/php-src
Christopher Jones [Tue, 9 Oct 2012 05:52:03 +0000 (22:52 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' 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.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.4'
Xinchen Hui [Tue, 9 Oct 2012 05:30:22 +0000 (13:30 +0800)]
Merge branch 'PHP-5.4'

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.4'
Xinchen Hui [Tue, 9 Oct 2012 05:16:53 +0000 (13:16 +0800)]
Merge branch 'PHP-5.4'

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 'master' of https://git.php.net/repository/php-src
Christopher Jones [Mon, 8 Oct 2012 23:13:12 +0000 (16:13 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src: (54 commits)
  Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
  Use zend_execute_internal always to call internal functions
  use zend_execute_internal
  exposing the libxpm version in phpinfo
  update
  5.4.9-dev
  PHP-5.3 branch is 5.3.19 now
  add a check for libmysql
  if ssl has been switched on transmit clear-text password
  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
  ...

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 agoMerge branch 'PHP-5.4'
Xinchen Hui [Mon, 8 Oct 2012 15:00:57 +0000 (23:00 +0800)]
Merge branch 'PHP-5.4'

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 agoUse zend_execute_internal always to call internal functions
Stanislav Malyshev [Fri, 5 Oct 2012 06:14:20 +0000 (08:14 +0200)]
Use zend_execute_internal always to call internal functions

12 years agouse zend_execute_internal
Stanislav Malyshev [Sun, 22 Jul 2012 21:25:00 +0000 (14:25 -0700)]
use zend_execute_internal

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

* PHP-5.4:
  exposing the libxpm version in phpinfo
  5.4.9-dev

Conflicts:
NEWS
configure.in
main/php_version.h

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 agoupdate
Andrey Hristov [Thu, 4 Oct 2012 11:40:23 +0000 (13:40 +0200)]
update

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 agoMerge branch 'master' of git.php.net:/php-src
Derick Rethans [Thu, 4 Oct 2012 07:38:56 +0000 (08:38 +0100)]
Merge branch 'master' of git.php.net:/php-src

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.4'
Johannes Schlüter [Thu, 4 Oct 2012 00:37:27 +0000 (02:37 +0200)]
Merge branch 'PHP-5.4'

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 agoadd a check for libmysql
Andrey Hristov [Wed, 3 Oct 2012 12:14:59 +0000 (14:14 +0200)]
add a check for libmysql

12 years agoMerge branch 'master' of ssh://git.php.net/php-src
Andrey Hristov [Wed, 3 Oct 2012 12:03:05 +0000 (14:03 +0200)]
Merge branch 'master' of ssh://git.php.net/php-src