]> granicus.if.org Git - php/log
php
12 years agoFixed bug #63248 Load multiple magic files on win
Anatoliy Belsky [Tue, 16 Oct 2012 09:03:32 +0000 (11:03 +0200)]
Fixed bug #63248 Load multiple magic files on win

- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
ULF WENDEL [Sat, 29 Sep 2012 10:17:13 +0000 (12:17 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
NEWS

12 years ago- BFN
Felipe Pena [Fri, 12 Oct 2012 22:48:30 +0000 (19:48 -0300)]
- BFN

12 years ago- Fixed bug #63214 (Large PDO Firebird Queries)
Felipe Pena [Fri, 12 Oct 2012 22:42:43 +0000 (19:42 -0300)]
- Fixed bug #63214 (Large PDO Firebird Queries)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Gustavo Lopes [Fri, 12 Oct 2012 18:24:13 +0000 (20:24 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #63240 on stream_get_line()

12 years agoFix bug #63240 on stream_get_line()
Gustavo Lopes [Fri, 12 Oct 2012 18:00:37 +0000 (20:00 +0200)]
Fix bug #63240 on stream_get_line()

stream_get_line() could contain the delimiter string if that string
had more than one character. The bug manifested itself when a read on
the stream ended with part of the delimiter string and the read after
would start with the rest of the delimiter string; provided that
the data of first read did not complete the max length result of the
call to stream_get_line() with the partial delimiter used in that max
length return. In that case, the delimiter will still appear in
the result, divided in two subsequent return values. That is not a bug.

See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 12 Oct 2012 17:53:35 +0000 (19:53 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)

12 years agoextended the SKIPIF section with ICU 49 (sync with 5.4 branch)
Anatoliy Belsky [Fri, 12 Oct 2012 17:50:35 +0000 (19:50 +0200)]
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 12 Oct 2012 17:38:13 +0000 (19:38 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed tests for gd having freetype >= 2.4.10

12 years agofixed tests for gd having freetype >= 2.4.10
Anatoliy Belsky [Fri, 12 Oct 2012 17:34:31 +0000 (19:34 +0200)]
fixed tests for gd having freetype >= 2.4.10

12 years agoFixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT...
Xinchen Hui [Fri, 12 Oct 2012 02:37:05 +0000 (10:37 +0800)]
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))

The exists test should has covered this bug

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 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.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 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])

12 years agoFixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic...
Xinchen Hui [Mon, 1 Oct 2012 14:42:22 +0000 (22:42 +0800)]
Fixed bug #63184  test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)

12 years agoMerge branch 'pull-request/209' into PHP-5.4
Stanislav Malyshev [Mon, 1 Oct 2012 03:31:36 +0000 (20:31 -0700)]
Merge branch 'pull-request/209' into PHP-5.4

* pull-request/209:
  Eliminate process running requirement of dump_bt in .gdbinit
  Add missing ____executor_globals in dump_bt if needed
  Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)

12 years agoMerge branch 'pull-request/210' into PHP-5.4
Stanislav Malyshev [Mon, 1 Oct 2012 03:09:27 +0000 (20:09 -0700)]
Merge branch 'pull-request/210' into PHP-5.4

* pull-request/210:
  Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.

12 years agoadd news for --offline
Stanislav Malyshev [Mon, 1 Oct 2012 02:41:41 +0000 (19:41 -0700)]
add news for --offline

12 years agoadd --offline option to run-tests command
Remi Collet [Tue, 25 Sep 2012 04:52:08 +0000 (06:52 +0200)]
add --offline option to run-tests command

12 years agoBug #63147: SKIP_ONLINE_TESTS, for getmxrr
Remi Collet [Mon, 24 Sep 2012 07:16:11 +0000 (09:16 +0200)]
Bug #63147: SKIP_ONLINE_TESTS, for getmxrr

12 years agoBug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
Remi Collet [Mon, 24 Sep 2012 07:15:03 +0000 (09:15 +0200)]
Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname

12 years agogethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
Remi Collet [Mon, 24 Sep 2012 07:13:40 +0000 (09:13 +0200)]
gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt

12 years agoadd bug #63162
Stanislav Malyshev [Mon, 1 Oct 2012 02:27:12 +0000 (19:27 -0700)]
add bug #63162

12 years agofix test and move to proper place
Stanislav Malyshev [Mon, 1 Oct 2012 02:24:42 +0000 (19:24 -0700)]
fix test and move to proper place

12 years agosynergy ftl. Removed duplicate fields.
husman [Thu, 27 Sep 2012 05:17:54 +0000 (01:17 -0400)]
synergy ftl. Removed duplicate fields.

12 years agoadding test phpt
husman [Thu, 27 Sep 2012 04:54:42 +0000 (00:54 -0400)]
adding test phpt

12 years agoBug #63162 - parse_url does not matches password component
husman [Thu, 27 Sep 2012 03:50:30 +0000 (23:50 -0400)]
Bug #63162 - parse_url does not matches password component

12 years agofix news
Stanislav Malyshev [Mon, 1 Oct 2012 02:08:24 +0000 (19:08 -0700)]
fix news

12 years agoEliminate process running requirement of dump_bt in .gdbinit
Reeze Xia [Sun, 30 Sep 2012 19:10:15 +0000 (03:10 +0800)]
Eliminate process running requirement of dump_bt in .gdbinit

Most of the time scope are avaible, but if not, it will be hard to get them,
since we can't call function if no proccess running. try to get class name
if we can.

12 years agoFix test
Xinchen Hui [Sun, 30 Sep 2012 16:15:47 +0000 (00:15 +0800)]
Fix test

12 years agoAdd missing ____executor_globals in dump_bt if needed
Reeze Xia [Sun, 30 Sep 2012 15:05:03 +0000 (23:05 +0800)]
Add missing ____executor_globals in dump_bt if needed

12 years agoFix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour)
Lonny Kapelushnik [Sun, 30 Sep 2012 04:31:29 +0000 (04:31 +0000)]
Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour)
Prevent a unix timestamp, which is always GMT when being parsed, from taking on
the local timezones DST flag.

12 years agoImplemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)
Reeze Xia [Sat, 29 Sep 2012 19:16:26 +0000 (03:16 +0800)]
Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)

12 years agoMinor changes for MySQL 5.6
ULF WENDEL [Sat, 29 Sep 2012 10:10:24 +0000 (12:10 +0200)]
Minor changes for MySQL 5.6

12 years agoNEWS for 76601c4
Gustavo Lopes [Fri, 12 Oct 2012 18:27:53 +0000 (20:27 +0200)]
NEWS for 76601c4

12 years agoRemove meaningless md5 string && Attempt to fix #63184
Xinchen Hui [Sat, 29 Sep 2012 06:38:29 +0000 (14:38 +0800)]
Remove meaningless md5 string && Attempt to fix #63184

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Fri, 28 Sep 2012 19:28:37 +0000 (15:28 -0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Update NEWS

12 years agoUpdate NEWS
Pierrick Charron [Fri, 28 Sep 2012 19:26:53 +0000 (15:26 -0400)]
Update NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Fri, 28 Sep 2012 19:21:33 +0000 (15:21 -0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  FD_ZERO file descriptors before calling curl_multi_fdset

12 years agoFD_ZERO file descriptors before calling curl_multi_fdset
Pierrick Charron [Fri, 28 Sep 2012 19:19:03 +0000 (15:19 -0400)]
FD_ZERO file descriptors before calling curl_multi_fdset

As per curl documentation http://curl.haxx.se/libcurl/c/curl_multi_fdset.html
we need to FD_ZERO file descriptors before calling the curl_multi_fdset function

12 years agoAdd missing NEWS entry
Jerome Loyet [Fri, 28 Sep 2012 09:22:16 +0000 (11:22 +0200)]
Add missing NEWS entry

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Jerome Loyet [Fri, 28 Sep 2012 09:21:12 +0000 (11:21 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62216

12 years agoMerge branch 'bug62216' into PHP-5.3
Jerome Loyet [Fri, 28 Sep 2012 09:20:47 +0000 (11:20 +0200)]
Merge branch 'bug62216' into PHP-5.3

* bug62216:
  Fixed bug #62216

12 years agoFixed bug #62216
Jerome Loyet [Fri, 28 Sep 2012 09:18:08 +0000 (11:18 +0200)]
Fixed bug #62216

Add PID to php-fpm init.d script

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 28 Sep 2012 07:03:52 +0000 (15:03 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years ago- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
Jerome Loyet [Thu, 27 Sep 2012 23:25:51 +0000 (01:25 +0200)]
- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")

12 years ago- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
Jerome Loyet [Thu, 27 Sep 2012 23:24:52 +0000 (01:24 +0200)]
- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")

12 years agoMerge branch 'fuckgit' into PHP-5.4
Jerome Loyet [Thu, 27 Sep 2012 23:19:01 +0000 (01:19 +0200)]
Merge branch 'fuckgit' into PHP-5.4

* fuckgit:
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - Fixed bug #63085 (Systemd integration and daemonize)

Conflicts:
sapi/fpm/config.m4

12 years ago- Fixed bug #62947 (Unneccesary warnings on FPM)
Jerome Loyet [Thu, 27 Sep 2012 23:08:48 +0000 (01:08 +0200)]
- Fixed bug #62947 (Unneccesary warnings on FPM)

12 years ago- Fixed bug #62947 (Unneccesary warnings on FPM)
Jerome Loyet [Thu, 27 Sep 2012 23:08:08 +0000 (01:08 +0200)]
- Fixed bug #62947 (Unneccesary warnings on FPM)

12 years ago- Fixed bug #63085 (Systemd integration and daemonize)
Jerome Loyet [Thu, 27 Sep 2012 22:53:05 +0000 (00:53 +0200)]
- Fixed bug #63085 (Systemd integration and daemonize)

12 years ago- add missing php-fpm.service.in
Jerome Loyet [Thu, 27 Sep 2012 22:47:56 +0000 (00:47 +0200)]
- add missing php-fpm.service.in

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Jerome Loyet [Thu, 27 Sep 2012 22:39:29 +0000 (00:39 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - 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)

Conflicts:
sapi/fpm/config.m4

12 years ago- Fixed bug #63085 (Systemd integration and daemonize)
Jerome Loyet [Thu, 27 Sep 2012 22:33:05 +0000 (00:33 +0200)]
- Fixed bug #63085 (Systemd integration and daemonize)

12 years ago- Fixed bug #62954 (startup problems fpm / php-fpm)
Jerome Loyet [Thu, 27 Sep 2012 22:05:48 +0000 (00:05 +0200)]
- Fixed bug #62954 (startup problems fpm / php-fpm)
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Jerome Loyet [Thu, 27 Sep 2012 21:57:06 +0000 (23:57 +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: (367 commits)
  fix unix/win dir separators
  Fix bug #63173: Crash when invoking invalid array callback
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixing NEWS file
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
  Fix folding
  fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
  Bug #63000: MCAST_JOIN_GROUP on OSX is broken
  Fixed bug #61442 (exception threw in __autoload can not be catched)
  Merging PR #116
  Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
  update news
  Support building PHP with the native client toolchain.
  ...

12 years ago- Fixed bug #62954 (startup problems fpm / php-fpm)
Jerome Loyet [Thu, 27 Sep 2012 21:54:35 +0000 (23:54 +0200)]
- Fixed bug #62954 (startup problems fpm / php-fpm)
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

12 years agofix unix/win dir separators
Anatoliy Belsky [Thu, 27 Sep 2012 17:52:34 +0000 (19:52 +0200)]
fix unix/win dir separators

12 years agoFix bug #63173: Crash when invoking invalid array callback
Nikita Popov [Thu, 27 Sep 2012 16:40:00 +0000 (18:40 +0200)]
Fix bug #63173: Crash when invoking invalid array callback

The code did not check whether the zend_hash_index_find calls succeded,
so PHP crashed when an array callback was called that contains two elements
which don't have the indices 0 and 1.

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Jerome Loyet [Wed, 26 Sep 2012 18:18:21 +0000 (20:18 +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: (29 commits)
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
  Fixed bug #61442 (exception threw in __autoload can not be catched)
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
  test should fail
  Fixed bug #63093 (Segfault while load extension failed in zts-build).
  Add XFAIL test for bug #62852
  Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
  This will become 5.3.18
  Update RELEASE PROCESS
  fix NEWS after releses
  Fix doc bug #63032 (Number of release in documentation).
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
  ...

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 24 Sep 2012 11:47:28 +0000 (19:47 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoCorrect the test summary
Xinchen Hui [Mon, 24 Sep 2012 11:46:40 +0000 (19:46 +0800)]
Correct the test summary

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 24 Sep 2012 03:00:58 +0000 (11:00 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/standard/tests/general_functions/bug60723.phpt

12 years agoFixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Xinchen Hui [Sun, 23 Sep 2012 14:59:31 +0000 (22:59 +0800)]
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)

Cherry pick to 5.3

12 years agoFixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Xinchen Hui [Sun, 23 Sep 2012 14:59:31 +0000 (22:59 +0800)]
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Sat, 22 Sep 2012 14:18:44 +0000 (10:18 -0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1

12 years agoAvoid calling select if maxfd returned by curl_multi_fdset is -1
Pierrick Charron [Sat, 22 Sep 2012 14:15:40 +0000 (10:15 -0400)]
Avoid calling select if maxfd returned by curl_multi_fdset is -1

As per libcurl documentation :

When libcurl returns -1 in max_fd, it is because libcurl currently
does something that isn't possible for your application to monitor
with a socket and unfortunately you can then not know exactly when
the current action is completed using select().

12 years agoFixing NEWS file
Lars Strojny [Fri, 21 Sep 2012 11:22:53 +0000 (13:22 +0200)]
Fixing NEWS file

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Dmitry Stogov [Fri, 21 Sep 2012 11:17:21 +0000 (15:17 +0400)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:php-src:
  updated lib versions

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Dmitry Stogov [Fri, 21 Sep 2012 11:16:57 +0000 (15:16 +0400)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  updated lib versions

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Fri, 21 Sep 2012 10:18:37 +0000 (14:18 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63111 (is_callable() lies for abstract static method)

Conflicts:
NEWS

12 years agoFixed bug #63111 (is_callable() lies for abstract static method)
Dmitry Stogov [Fri, 21 Sep 2012 09:07:14 +0000 (13:07 +0400)]
Fixed bug #63111 (is_callable() lies for abstract static method)

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

* PHP-5.3:
  updated lib versions

12 years agoupdated lib versions
Anatoliy Belsky [Fri, 21 Sep 2012 07:57:22 +0000 (09:57 +0200)]
updated lib versions

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Rasmus Lerdorf [Thu, 20 Sep 2012 18:22:55 +0000 (14:22 -0400)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4