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

12 years agoFix folding
Rasmus Lerdorf [Thu, 20 Sep 2012 18:22:15 +0000 (14:22 -0400)]
Fix folding

12 years agofix bug #63015 (Incorrect arginfo for DOMErrorHandler)
Rob Richards [Thu, 20 Sep 2012 06:34:07 +0000 (02:34 -0400)]
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)

12 years agoMerge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
Lars Strojny [Wed, 19 Sep 2012 20:18:16 +0000 (22:18 +0200)]
Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4

12 years agoBug #63000: MCAST_JOIN_GROUP on OSX is broken
Lars Strojny [Wed, 19 Sep 2012 20:17:35 +0000 (22:17 +0200)]
Bug #63000: MCAST_JOIN_GROUP on OSX is broken

The multicast support in PHP 5.4 makes use of MCAST_JOIN_GROUP if it is present.
The problem is that OSX 10.7 added the constant, but did not correctly implement
the feature. This causes the setsockopt call to fail.

The solution to the problem is to not use MCAST_JOIN_GROUP on OSX.

For reference, this was also done in VLC:

* http://trac.videolan.org/vlc/ticket/6104#comment:19

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 19 Sep 2012 11:44:18 +0000 (19:44 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #61442 (exception threw in __autoload can not be catched)
Xinchen Hui [Wed, 19 Sep 2012 11:40:59 +0000 (19:40 +0800)]
Fixed bug #61442 (exception threw in __autoload can not be catched)

12 years agoMerging PR #116
Lars Strojny [Tue, 18 Sep 2012 21:15:03 +0000 (23:15 +0200)]
Merging PR #116

12 years agoMerged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
Lars Strojny [Tue, 18 Sep 2012 20:16:51 +0000 (22:16 +0200)]
Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 18 Sep 2012 08:20:05 +0000 (10:20 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated libary versions

Conflicts:
win32/build/libs_version.txt

12 years agoupdated libary versions
Anatoliy Belsky [Tue, 18 Sep 2012 08:18:26 +0000 (10:18 +0200)]
updated libary versions

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 18 Sep 2012 08:02:05 +0000 (10:02 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  split tests for the new zlib version on win

12 years agosplit tests for the new zlib version on win
Anatoliy Belsky [Tue, 18 Sep 2012 07:59:49 +0000 (09:59 +0200)]
split tests for the new zlib version on win

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 18 Sep 2012 02:48:16 +0000 (10:48 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
Xinchen Hui [Tue, 18 Sep 2012 02:46:58 +0000 (10:46 +0800)]
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)

12 years agoupdate news
Stanislav Malyshev [Mon, 17 Sep 2012 22:58:27 +0000 (15:58 -0700)]
update news

12 years agoSupport building PHP with the native client toolchain.
Stuart Langley [Thu, 13 Sep 2012 15:37:37 +0000 (17:37 +0200)]
Support building PHP with the native client toolchain.

The native client compiler defines the C macro __x86_64__, but the size
of an unsigned int is only 4 bytes. This causes the compile to fail
because the inline asm code compiled is for an 8 byte unsigned int. Add
the correct defines to fix this.

As detailed in:
http://code.google.com/p/nativeclient/issues/detail?id=2255

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

12 years agotest should fail
Xinchen Hui [Mon, 17 Sep 2012 03:20:24 +0000 (11:20 +0800)]
test should fail

12 years agoRespond with 501 to unknown request methods
Niklas Lindgren [Wed, 12 Sep 2012 16:34:59 +0000 (19:34 +0300)]
Respond with 501 to unknown request methods

Fixed typo

Moved 501 response from dispatch to event_read_request

Return return value of send_error_page

12 years agonews for bug #61421
Stanislav Malyshev [Sun, 16 Sep 2012 06:02:10 +0000 (23:02 -0700)]
news for bug #61421

12 years agocommit for php bug 61421
Mark Jones [Fri, 14 Sep 2012 14:59:14 +0000 (08:59 -0600)]
commit for php bug 61421
enabling SHA2 and RMD160 for openssl signature verification

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 15 Sep 2012 03:50:49 +0000 (11:50 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63093 (Segfault while load extension failed in zts-build).
Xinchen Hui [Sat, 15 Sep 2012 03:50:16 +0000 (11:50 +0800)]
Fixed bug #63093 (Segfault while load extension failed in zts-build).

12 years agoRemove bug fixed entry
Xinchen Hui [Sat, 15 Sep 2012 03:32:44 +0000 (11:32 +0800)]
Remove bug fixed entry

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 15 Sep 2012 03:32:08 +0000 (11:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoAdd XFAIL test for bug #62852
Xinchen Hui [Sat, 15 Sep 2012 03:29:47 +0000 (11:29 +0800)]
Add XFAIL test for bug #62852

12 years agoRevert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
Xinchen Hui [Sat, 15 Sep 2012 03:26:21 +0000 (11:26 +0800)]
Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"

see: http://news.php.net/php.bugs/173451

This reverts commit 46a3f257724df7b85cc8c3e6374c36ed9ee783b4.

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Christopher Jones [Fri, 14 Sep 2012 05:44:12 +0000 (22:44 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoMerge branch 'bug60901' into PHP-5.3
Christopher Jones [Fri, 14 Sep 2012 05:43:37 +0000 (22:43 -0700)]
Merge branch 'bug60901' into PHP-5.3

* bug60901:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoChange package.xml fix description
Christopher Jones [Fri, 14 Sep 2012 05:43:10 +0000 (22:43 -0700)]
Change package.xml fix description

12 years agoFixed bug #60901 (Improve "tail" syntax for AIX installation)
Christopher Jones [Fri, 14 Sep 2012 05:40:55 +0000 (22:40 -0700)]
Fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 14 Sep 2012 01:09:12 +0000 (18:09 -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:
  This will become 5.3.18
  Update RELEASE PROCESS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 13 Sep 2012 21:10:22 +0000 (23:10 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

12 years agoThis will become 5.3.18
Johannes Schlüter [Thu, 13 Sep 2012 21:08:30 +0000 (23:08 +0200)]
This will become 5.3.18

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
David Soria Parra [Thu, 13 Sep 2012 18:23:05 +0000 (20:23 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Update RELEASE PROCESS

12 years agoUpdate RELEASE PROCESS
David Soria Parra [Thu, 13 Sep 2012 18:19:23 +0000 (20:19 +0200)]
Update RELEASE PROCESS

Some parts of the release process are outdated, not needed anymore
or still reference cvs.

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 13 Sep 2012 01:14:33 +0000 (18:14 -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:
  fix NEWS after releses
  Merge 5.3.16 NEWS in.

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 12 Sep 2012 21:35:29 +0000 (23:35 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agofix NEWS after releses
Johannes Schlüter [Wed, 12 Sep 2012 21:35:05 +0000 (23:35 +0200)]
fix NEWS after releses

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Johannes Schlüter [Wed, 12 Sep 2012 21:05:24 +0000 (23:05 +0200)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Tue, 11 Sep 2012 23:39:39 +0000 (16:39 -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:
  regenerate patch, and save a strlen
  Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag

12 years agoregenerate patch, and save a strlen
Xinchen Hui [Tue, 11 Sep 2012 03:43:47 +0000 (11:43 +0800)]
regenerate patch, and save a strlen

12 years agoFix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313...
Xinchen Hui [Mon, 10 Sep 2012 15:08:54 +0000 (23:08 +0800)]
Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8

12 years agoFixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Dmitry Stogov [Mon, 10 Sep 2012 10:54:18 +0000 (14:54 +0400)]
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 10 Sep 2012 07:04:38 +0000 (00:04 -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: (54 commits)
  Fix doc bug #63032 (Number of release in documentation).
  fixed test for bug #52944 also for darwin
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
  year++
  correct PHP version & year++
  Correct PHP version
  year++
  - fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
  Fixed bug #62907 (Double free when use traits)
  forked two tests for windows
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
  Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
  Allow null as a default value for length in mb_substr() and mb_strcut()
  folder
  Initializing optional argument description in assert()
  fix NEWS
  Remove extra blank in notice message, should act as same as vm
  Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
  ...

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Adam Harvey [Mon, 10 Sep 2012 02:06:10 +0000 (10:06 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFix doc bug #63032 (Number of release in documentation).
Adam Harvey [Mon, 10 Sep 2012 02:05:15 +0000 (10:05 +0800)]
Fix doc bug #63032 (Number of release in documentation).

Also add a bonus grammar fix.

12 years agofixed test for bug #52944 also for darwin
Reeze Xia [Sun, 9 Sep 2012 21:02:50 +0000 (23:02 +0200)]
fixed test for bug #52944 also for darwin

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Thu, 6 Sep 2012 08:14:29 +0000 (12:14 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)

Conflicts:
NEWS
Zend/zend_object_handlers.c

12 years ago- Fixed bug #61767 (Shutdown functions not called in certain error situation)
Dmitry Stogov [Thu, 6 Sep 2012 07:26:40 +0000 (11:26 +0400)]
- 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 [Wed, 5 Sep 2012 15:48:27 +0000 (23:48 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoyear++
Xinchen Hui [Wed, 5 Sep 2012 15:47:21 +0000 (23:47 +0800)]
year++

missed the .re files in 5.3

12 years agocorrect PHP version & year++
Xinchen Hui [Wed, 5 Sep 2012 15:43:59 +0000 (23:43 +0800)]
correct PHP version & year++

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 5 Sep 2012 15:42:45 +0000 (23:42 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoCorrect PHP version
Xinchen Hui [Wed, 5 Sep 2012 15:41:42 +0000 (23:41 +0800)]
Correct PHP version

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 5 Sep 2012 15:11:19 +0000 (23:11 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/interbase/interbase.rc

12 years agoyear++
Xinchen Hui [Wed, 5 Sep 2012 15:08:05 +0000 (23:08 +0800)]
year++

12 years ago- fix build, there was no tsrm context there, doing a fetch but this is horribly...
Pierre Joye [Wed, 5 Sep 2012 11:00:04 +0000 (13:00 +0200)]
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master

12 years agoFixed bug #62907 (Double free when use traits)
Dmitry Stogov [Wed, 5 Sep 2012 05:58:22 +0000 (09:58 +0400)]
Fixed bug #62907 (Double free when use traits)