]>
granicus.if.org Git - php/log
Nikita Popov [Sat, 29 Jun 2013 19:51:54 +0000 (21:51 +0200)]
Don't try to clean up generator stack on unclean shutdown
This fixes bugs #65035 and #65161. In one of the bugs the issue is
that function_state.arguments is NULL, but the arg count is pushed
to the stack and the code tries to free it. In the other bug the
stack of the generator is freed twice, once in generator_close and
later during shutdown.
It's rather hard (if at all possible) to do a proper stack cleanup
on an unclean shutdown, so I'm just disabling it in this case.
Arnaud Le Blanc [Sat, 29 Jun 2013 15:54:55 +0000 (17:54 +0200)]
NEWS
Arnaud Le Blanc [Sun, 28 Apr 2013 14:25:30 +0000 (16:25 +0200)]
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
Yasuo Ohgaki [Fri, 28 Jun 2013 21:45:18 +0000 (06:45 +0900)]
Fixed bug #49175: mod_files.sh does not support hash bits
Stanislav Malyshev [Fri, 28 Jun 2013 21:01:53 +0000 (14:01 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add fix for #60560 into upgrading
Stanislav Malyshev [Fri, 28 Jun 2013 21:01:25 +0000 (14:01 -0700)]
add fix for #60560 into upgrading
Stanislav Malyshev [Fri, 28 Jun 2013 20:55:26 +0000 (13:55 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860: use USearch for searches, it does the right thing
Stanislav Malyshev [Fri, 28 Jun 2013 20:53:13 +0000 (13:53 -0700)]
Merge branch 'bug61860' into PHP-5.4
* bug61860:
small optimization
fix bug #61860: use USearch for searches, it does the right thing
Adam Harvey [Tue, 21 Feb 2012 10:34:42 +0000 (10:34 +0000)]
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
Arpad Ray [Thu, 27 Jun 2013 18:23:58 +0000 (19:23 +0100)]
Update NEWS
Arpad Ray [Thu, 27 Jun 2013 18:12:46 +0000 (19:12 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Arpad Ray [Thu, 27 Jun 2013 18:05:23 +0000 (19:05 +0100)]
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.
Arpad Ray [Thu, 27 Jun 2013 11:49:16 +0000 (12:49 +0100)]
Update NEWS
Arpad Ray [Thu, 27 Jun 2013 11:33:56 +0000 (12:33 +0100)]
BC fix for PR 109 merge - create_sid() method in SessionHandler
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.
Also added several more tests for this feature.
Arpad Ray [Thu, 27 Jun 2013 10:27:49 +0000 (11:27 +0100)]
Merge PR 109 - Add create_sid to session_set_save_handler and SessionHandler
Allows user session handlers to create session IDs by adding an optional
7th argument to session_set_save_handler() and a create_sid() method
to SessionHandler.
Xinchen Hui [Thu, 27 Jun 2013 04:38:35 +0000 (12:38 +0800)]
Update NEWS:w
Xinchen Hui [Thu, 27 Jun 2013 04:38:13 +0000 (12:38 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 27 Jun 2013 04:37:57 +0000 (12:37 +0800)]
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
Felipe Pena [Wed, 26 Jun 2013 22:16:26 +0000 (19:16 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
Felipe Pena [Wed, 26 Jun 2013 22:16:13 +0000 (19:16 -0300)]
- BFN
Felipe Pena [Wed, 26 Jun 2013 22:15:19 +0000 (19:15 -0300)]
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
Felipe Pena [Wed, 26 Jun 2013 18:15:37 +0000 (15:15 -0300)]
- Reclassify bug
Felipe Pena [Wed, 26 Jun 2013 18:08:51 +0000 (15:08 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
Felipe Pena [Wed, 26 Jun 2013 18:08:33 +0000 (15:08 -0300)]
- BFN
Felipe Pena [Wed, 26 Jun 2013 18:06:27 +0000 (15:06 -0300)]
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
Felipe Pena [Wed, 26 Jun 2013 16:50:43 +0000 (13:50 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
Felipe Pena [Wed, 26 Jun 2013 16:50:37 +0000 (13:50 -0300)]
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
Felipe Pena [Wed, 26 Jun 2013 16:36:41 +0000 (13:36 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed test
Felipe Pena [Wed, 26 Jun 2013 16:36:36 +0000 (13:36 -0300)]
- Fixed test
Andrey Hristov [Wed, 26 Jun 2013 14:50:08 +0000 (16:50 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Andrey Hristov [Wed, 26 Jun 2013 14:44:26 +0000 (16:44 +0200)]
add new test
Yasuo Ohgaki [Wed, 26 Jun 2013 07:31:34 +0000 (16:31 +0900)]
Update NEWS
Yasuo Ohgaki [Wed, 26 Jun 2013 07:17:57 +0000 (16:17 +0900)]
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
Felipe Pena [Wed, 26 Jun 2013 00:53:20 +0000 (21:53 -0300)]
- Fixed typo on condition
Felipe Pena [Wed, 26 Jun 2013 00:44:03 +0000 (21:44 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- BFN
Felipe Pena [Wed, 26 Jun 2013 00:43:23 +0000 (21:43 -0300)]
- BFN
Felipe Pena [Wed, 26 Jun 2013 00:40:24 +0000 (21:40 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Update NEWS
- BFN
Felipe Pena [Wed, 26 Jun 2013 00:39:17 +0000 (21:39 -0300)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Felipe Pena [Wed, 26 Jun 2013 00:36:50 +0000 (21:36 -0300)]
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Christopher Jones [Wed, 26 Jun 2013 00:31:13 +0000 (17:31 -0700)]
Update NEWS
Christopher Jones [Wed, 26 Jun 2013 00:30:21 +0000 (17:30 -0700)]
Update NEWS
Christopher Jones [Wed, 26 Jun 2013 00:28:12 +0000 (17:28 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Christopher Jones [Wed, 26 Jun 2013 00:28:11 +0000 (17:28 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
- BFN
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Felipe Pena [Wed, 26 Jun 2013 00:19:56 +0000 (21:19 -0300)]
- BFN
Felipe Pena [Wed, 26 Jun 2013 00:18:34 +0000 (21:18 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
Felipe Pena [Wed, 26 Jun 2013 00:18:09 +0000 (21:18 -0300)]
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
Felipe Pena [Tue, 25 Jun 2013 21:04:25 +0000 (18:04 -0300)]
- BFN
Felipe Pena [Tue, 25 Jun 2013 21:01:46 +0000 (18:01 -0300)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Felipe Pena [Tue, 25 Jun 2013 21:01:40 +0000 (18:01 -0300)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Felipe Pena [Tue, 25 Jun 2013 21:00:42 +0000 (18:00 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
Felipe Pena [Tue, 25 Jun 2013 21:00:33 +0000 (18:00 -0300)]
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Christopher Jones [Tue, 25 Jun 2013 20:25:04 +0000 (13:25 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- BFN
Christopher Jones [Tue, 25 Jun 2013 20:23:50 +0000 (13:23 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
Christopher Jones [Tue, 25 Jun 2013 20:23:25 +0000 (13:23 -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:
- BFN
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
Felipe Pena [Tue, 25 Jun 2013 19:27:30 +0000 (16:27 -0300)]
- BFN
Felipe Pena [Tue, 25 Jun 2013 19:26:36 +0000 (16:26 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
Felipe Pena [Tue, 25 Jun 2013 19:26:26 +0000 (16:26 -0300)]
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
Christopher Jones [Tue, 25 Jun 2013 19:00:24 +0000 (12:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
Christopher Jones [Tue, 25 Jun 2013 19:00:08 +0000 (12:00 -0700)]
Merge branch 'configure12c' into PHP-5.4
* configure12c:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
Christopher Jones [Tue, 25 Jun 2013 18:55:41 +0000 (11:55 -0700)]
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
(note OCI8 already builds with Oracle Database 12c)
Xinchen Hui [Tue, 25 Jun 2013 05:47:50 +0000 (13:47 +0800)]
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)
I can not get a reproduce script since the context is very strict.
Of course I will try to make one, but for now, I just commit this first.
Xinchen Hui [Tue, 25 Jun 2013 05:39:31 +0000 (13:39 +0800)]
Update NEWS
Xinchen Hui [Tue, 25 Jun 2013 05:38:50 +0000 (13:38 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Tue, 25 Jun 2013 05:37:56 +0000 (13:37 +0800)]
Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)
Christopher Jones [Tue, 25 Jun 2013 00:12:35 +0000 (17:12 -0700)]
Some tidy-ups: Don't mention Logo GUIDs in three places; mention
password_hash functionality; add some doc URLs for new features;
grammar & typos; formatting changes.
Felipe Pena [Mon, 24 Jun 2013 19:49:22 +0000 (16:49 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
- BFN
Felipe Pena [Mon, 24 Jun 2013 19:49:15 +0000 (16:49 -0300)]
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
Felipe Pena [Mon, 24 Jun 2013 17:50:14 +0000 (14:50 -0300)]
- BFN
Felipe Pena [Mon, 24 Jun 2013 17:47:40 +0000 (14:47 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
Felipe Pena [Mon, 24 Jun 2013 17:43:35 +0000 (14:43 -0300)]
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
Xinchen Hui [Mon, 24 Jun 2013 15:49:45 +0000 (23:49 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Mon, 24 Jun 2013 15:49:30 +0000 (23:49 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_API.c
Xinchen Hui [Mon, 24 Jun 2013 15:45:08 +0000 (23:45 +0800)]
Fixed bug (is_callable() triggers Fatal Error)
This bug is also exists in 5.4, and previous fix by dsp is not complete
for __callStatic stituation, see test script
David Soria Parra [Mon, 24 Jun 2013 15:44:00 +0000 (17:44 +0200)]
Notify doc team BEFORE we release
David Soria Parra [Mon, 24 Jun 2013 13:38:48 +0000 (15:38 +0200)]
Fix #65108 (is_callable() triggers Fatal Error)
We have to check if the fcall info cache contains a pointer if we
use __call, otherwise we endup in a static lookup.
Remi Collet [Mon, 24 Jun 2013 09:15:50 +0000 (11:15 +0200)]
fix imagecreatefromwebp and imagewebp protos
Remi Collet [Mon, 24 Jun 2013 09:10:52 +0000 (11:10 +0200)]
Use same logic to load WebP image that other formats
Remi Collet [Mon, 24 Jun 2013 09:03:12 +0000 (11:03 +0200)]
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
Dmitry Stogov [Mon, 24 Jun 2013 07:59:50 +0000 (11:59 +0400)]
OPcache must be compatible with LiteSpeed SAPI
Stanislav Malyshev [Mon, 24 Jun 2013 06:52:28 +0000 (23:52 -0700)]
small optimization
Stanislav Malyshev [Mon, 24 Jun 2013 06:37:10 +0000 (23:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
seems to be working fine for me on 32-bit
Stanislav Malyshev [Mon, 24 Jun 2013 06:36:43 +0000 (23:36 -0700)]
seems to be working fine for me on 32-bit
Stanislav Malyshev [Mon, 24 Jun 2013 06:24:12 +0000 (23:24 -0700)]
fix bug #61860: use USearch for searches, it does the right thing
Stanislav Malyshev [Mon, 24 Jun 2013 04:26:43 +0000 (21:26 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #62759: Buggy grapheme_substr() on edge case
Stanislav Malyshev [Mon, 24 Jun 2013 04:25:12 +0000 (21:25 -0700)]
Fix bug #62759: Buggy grapheme_substr() on edge case
Jakub Vrana [Wed, 15 May 2013 19:40:49 +0000 (12:40 -0700)]
Require second parameter of imagecrop()
Stanislav Malyshev [Sun, 23 Jun 2013 22:21:45 +0000 (15:21 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
Conflicts:
ext/sockets/sockets.c
Damjan Cvetko [Mon, 10 Jun 2013 10:11:14 +0000 (12:11 +0200)]
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
Stanislav Malyshev [Sun, 23 Jun 2013 20:54:50 +0000 (13:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Adding test to verify that __sleep can handle parent classes' private members
Adding test to stabelize keys used when converting objects to arrays
Marco Pivetta [Thu, 20 Jun 2013 08:34:45 +0000 (10:34 +0200)]
Adding test to verify that __sleep can handle parent classes' private members
Marco Pivetta [Thu, 20 Jun 2013 08:17:32 +0000 (10:17 +0200)]
Adding test to stabelize keys used when converting objects to arrays
Adam Harvey [Sun, 23 Jun 2013 18:04:10 +0000 (11:04 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
Adam Harvey [Sun, 23 Jun 2013 18:01:36 +0000 (11:01 -0700)]
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.
[0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html
Remi Collet [Fri, 21 Jun 2013 12:11:04 +0000 (14:11 +0200)]
Fixed Bug #65060 imagecreatefrom... crashes with user streams
Fixed Bug #65084 imagecreatefromjpeg fails with URL
Regression introduced in
8a90aad (drop of USE_GD_IOCTX)
Secure with php_stream_can_cast to avoid segfault in php_stream_cast.
(encountered when imagecreatefromxpm with URL)
Ard Biesheuvel [Fri, 21 Jun 2013 09:26:37 +0000 (11:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_def.h
Ard Biesheuvel [Fri, 21 Jun 2013 09:07:30 +0000 (11:07 +0200)]
Fix non-specialized executor build
Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit
7628da98
Pierre Joye [Thu, 20 Jun 2013 20:22:07 +0000 (22:22 +0200)]
fix #65070, bgcolor does not use the same format as the input image with imagerotate
Pierre Joye [Thu, 20 Jun 2013 20:19:53 +0000 (22:19 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Thu, 20 Jun 2013 20:19:33 +0000 (22:19 +0200)]
fix #65070, bgcolor does not use the same format as the input image with imagerotate
Adam Harvey [Thu, 20 Jun 2013 16:39:37 +0000 (09:39 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.