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
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().
Lars Strojny [Fri, 21 Sep 2012 11:22:53 +0000 (13:22 +0200)]
Fixing NEWS file
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
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
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
Dmitry Stogov [Fri, 21 Sep 2012 09:07:14 +0000 (13:07 +0400)]
Fixed bug #63111 (is_callable() lies for abstract static method)
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
Anatoliy Belsky [Fri, 21 Sep 2012 07:57:22 +0000 (09:57 +0200)]
updated lib versions
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
Rasmus Lerdorf [Thu, 20 Sep 2012 18:22:15 +0000 (14:22 -0400)]
Fix folding
Rob Richards [Thu, 20 Sep 2012 06:34:07 +0000 (02:34 -0400)]
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
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
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
Xinchen Hui [Wed, 19 Sep 2012 11:44:18 +0000 (19:44 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 19 Sep 2012 11:40:59 +0000 (19:40 +0800)]
Fixed bug #61442 (exception threw in __autoload can not be catched)
Lars Strojny [Tue, 18 Sep 2012 21:15:03 +0000 (23:15 +0200)]
Merging PR #116
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
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
Anatoliy Belsky [Tue, 18 Sep 2012 08:18:26 +0000 (10:18 +0200)]
updated libary versions
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
Anatoliy Belsky [Tue, 18 Sep 2012 07:59:49 +0000 (09:59 +0200)]
split tests for the new zlib version on win
Xinchen Hui [Tue, 18 Sep 2012 02:48:16 +0000 (10:48 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 18 Sep 2012 02:46:58 +0000 (10:46 +0800)]
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
Stanislav Malyshev [Mon, 17 Sep 2012 22:58:27 +0000 (15:58 -0700)]
update news
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
Xinchen Hui [Mon, 17 Sep 2012 03:21:14 +0000 (11:21 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 17 Sep 2012 03:20:24 +0000 (11:20 +0800)]
test should fail
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
Stanislav Malyshev [Sun, 16 Sep 2012 06:02:10 +0000 (23:02 -0700)]
news for 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
Xinchen Hui [Sat, 15 Sep 2012 03:50:49 +0000 (11:50 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 15 Sep 2012 03:50:16 +0000 (11:50 +0800)]
Fixed bug #63093 (Segfault while load extension failed in zts-build).
Xinchen Hui [Sat, 15 Sep 2012 03:32:44 +0000 (11:32 +0800)]
Remove bug fixed entry
Xinchen Hui [Sat, 15 Sep 2012 03:32:08 +0000 (11:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 15 Sep 2012 03:29:47 +0000 (11:29 +0800)]
Add XFAIL test for bug #62852
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.
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)
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)
Christopher Jones [Fri, 14 Sep 2012 05:43:10 +0000 (22:43 -0700)]
Change package.xml fix description
Christopher Jones [Fri, 14 Sep 2012 05:40:55 +0000 (22:40 -0700)]
Fixed bug #60901 (Improve "tail" syntax for AIX installation)
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
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
Johannes Schlüter [Thu, 13 Sep 2012 21:08:30 +0000 (23:08 +0200)]
This will become 5.3.18
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
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.
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.
Johannes Schlüter [Wed, 12 Sep 2012 21:35:29 +0000 (23:35 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 12 Sep 2012 21:35:05 +0000 (23:35 +0200)]
fix NEWS after releses
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
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
Xinchen Hui [Tue, 11 Sep 2012 03:43:47 +0000 (11:43 +0800)]
regenerate patch, and save a strlen
Xinchen Hui [Mon, 10 Sep 2012 15:08:54 +0000 (23:08 +0800)]
Fix the wrong use of snprintf which is introduced in
1d2f61904987133d542c68cd349cf313d0bef1c8
Dmitry Stogov [Mon, 10 Sep 2012 10:54:18 +0000 (14:54 +0400)]
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
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)
...
Adam Harvey [Mon, 10 Sep 2012 02:06:10 +0000 (10:06 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
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.
Reeze Xia [Sun, 9 Sep 2012 21:02:50 +0000 (23:02 +0200)]
fixed test for bug #52944 also for darwin
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
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)
Xinchen Hui [Wed, 5 Sep 2012 15:48:27 +0000 (23:48 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 5 Sep 2012 15:47:21 +0000 (23:47 +0800)]
year++
missed the .re files in 5.3
Xinchen Hui [Wed, 5 Sep 2012 15:43:59 +0000 (23:43 +0800)]
correct PHP version & year++
Xinchen Hui [Wed, 5 Sep 2012 15:42:45 +0000 (23:42 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 5 Sep 2012 15:41:42 +0000 (23:41 +0800)]
Correct PHP version
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
Xinchen Hui [Wed, 5 Sep 2012 15:08:05 +0000 (23:08 +0800)]
year++
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
Dmitry Stogov [Wed, 5 Sep 2012 05:58:22 +0000 (09:58 +0400)]
Fixed bug #62907 (Double free when use traits)
Anatoliy Belsky [Mon, 3 Sep 2012 11:37:34 +0000 (13:37 +0200)]
forked two tests for windows
* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out
Most likely the ASM optimization under windows is responsible
for this behaviour.
Dmitry Stogov [Mon, 3 Sep 2012 07:51:17 +0000 (11:51 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Dmitry Stogov [Mon, 3 Sep 2012 07:51:08 +0000 (11:51 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Dmitry Stogov [Mon, 3 Sep 2012 07:49:58 +0000 (11:49 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Dmitry Stogov [Mon, 3 Sep 2012 07:47:59 +0000 (11:47 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Dmitry Stogov [Mon, 3 Sep 2012 07:46:47 +0000 (11:46 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Lars Strojny [Sun, 2 Sep 2012 20:10:23 +0000 (22:10 +0200)]
Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
Lars Strojny [Sun, 2 Sep 2012 12:53:52 +0000 (14:53 +0200)]
Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
Lars Strojny [Sun, 2 Sep 2012 12:52:05 +0000 (14:52 +0200)]
Allow null as a default value for length in mb_substr() and mb_strcut()
Xinchen Hui [Sun, 2 Sep 2012 08:52:53 +0000 (16:52 +0800)]
folder
Lars Strojny [Sun, 2 Sep 2012 06:01:18 +0000 (08:01 +0200)]
Initializing optional argument description in assert()
Stanislav Malyshev [Sat, 1 Sep 2012 23:55:51 +0000 (16:55 -0700)]
fix NEWS
Xinchen Hui [Sat, 1 Sep 2012 06:37:45 +0000 (14:37 +0800)]
Remove extra blank in notice message, should act as same as vm
Xinchen Hui [Sat, 1 Sep 2012 06:27:09 +0000 (14:27 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/spl/spl_array.c
Xinchen Hui [Sat, 1 Sep 2012 06:17:39 +0000 (14:17 +0800)]
Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
Lars Strojny [Fri, 31 Aug 2012 17:04:53 +0000 (19:04 +0200)]
assert() user message
Added 2nd, optional, param to assert. When passed in it will be added
to the printed warnings and passed as a 4th param to a callback. PR 150
by Lonny Kapelushnik
Xinchen Hui [Fri, 31 Aug 2012 03:23:33 +0000 (11:23 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 31 Aug 2012 03:22:43 +0000 (11:22 +0800)]
Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes)
Johannes Schlüter [Thu, 30 Aug 2012 20:30:37 +0000 (22:30 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 30 Aug 2012 19:54:13 +0000 (21:54 +0200)]
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Felipe Pena [Thu, 30 Aug 2012 12:33:35 +0000 (09:33 -0300)]
- BFN
Felipe Pena [Thu, 30 Aug 2012 12:32:26 +0000 (09:32 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
Felipe Pena [Thu, 30 Aug 2012 12:32:13 +0000 (09:32 -0300)]
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
Anatoliy Belsky [Wed, 29 Aug 2012 15:49:02 +0000 (17:49 +0200)]
updated mpir version
Gustavo André dos Santos Lopes [Wed, 29 Aug 2012 13:30:39 +0000 (14:30 +0100)]
Merge 5.3 with strategy ours
* origin/PHP-5.3:
Fixed defective cloning in ext/intl classes
Johannes Schlüter [Wed, 29 Aug 2012 10:33:55 +0000 (12:33 +0200)]
Merge 5.3.16 NEWS in.
Stanislav Malyshev [Wed, 29 Aug 2012 05:10:34 +0000 (22:10 -0700)]
update version id too
Stanislav Malyshev [Wed, 29 Aug 2012 05:07:08 +0000 (22:07 -0700)]
5.4.7 branched
Stanislav Malyshev [Sat, 30 Jun 2012 23:31:26 +0000 (16:31 -0700)]
fix bug #55856: preg_replace should fail on trailing garbage
Lars Strojny [Tue, 28 Aug 2012 12:06:18 +0000 (14:06 +0200)]
Bug #62956: fixing private method signature validation
In inheritance, if both methods are private, don not enforce the same
signature.
Gustavo Lopes [Sun, 26 Aug 2012 21:37:09 +0000 (23:37 +0200)]
Fixed defective cloning in ext/intl classes
See also bug #62915
Cherry picked from
886a50a (I forgot about 5.3)
Conflicts:
ext/intl/spoofchecker/spoofchecker_class.c
ext/intl/transliterator/transliterator_class.c