Commit Graph

74937 Commits

Author SHA1 Message Date
Remi Collet
8c694401bb Merge branch 'PHP-5.5'
* PHP-5.5:
  Use same logic to load WebP image that other formats
2013-06-24 11:11:02 +02:00
Remi Collet
8075f1f4a3 Use same logic to load WebP image that other formats 2013-06-24 11:10:52 +02:00
Remi Collet
6c56d785ae Merge branch 'PHP-5.5'
* PHP-5.5:
  Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
2013-06-24 11:04:10 +02:00
Remi Collet
b4632d0c12 Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75 2013-06-24 11:03:12 +02:00
Dmitry Stogov
0c9de2d94b Merge branch 'PHP-5.5'
* PHP-5.5:
  OPcache must be compatible with LiteSpeed SAPI

Conflicts:
	NEWS
2013-06-24 12:01:58 +04:00
Dmitry Stogov
f49b27e166 OPcache must be compatible with LiteSpeed SAPI 2013-06-24 11:59:50 +04:00
Stanislav Malyshev
91cc70c430 Merge branch 'PHP-5.5'
* PHP-5.5:
  seems to be working fine for me on 32-bit
2013-06-23 23:38:15 -07:00
Stanislav Malyshev
ae5a09b47d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  seems to be working fine for me on 32-bit
2013-06-23 23:37:10 -07:00
Stanislav Malyshev
a0d48e01ed seems to be working fine for me on 32-bit 2013-06-23 23:36:43 -07:00
Stanislav Malyshev
30227f7a59 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62759: Buggy grapheme_substr() on edge case
2013-06-23 21:27:20 -07:00
Stanislav Malyshev
9872835cf3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #62759: Buggy grapheme_substr() on edge case
2013-06-23 21:27:08 -07:00
Stanislav Malyshev
860a5c4b01 Fix bug #62759: Buggy grapheme_substr() on edge case 2013-06-23 21:26:16 -07:00
Stanislav Malyshev
46c46921b1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Require second parameter of imagecrop()
2013-06-23 20:30:03 -07:00
Jakub Vrana
e1acaea4f1 Require second parameter of imagecrop() 2013-06-23 20:29:54 -07:00
Stanislav Malyshev
e02b41d25c Merge branch 'PHP-5.5'
* PHP-5.5:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
2013-06-23 15:26:30 -07:00
Stanislav Malyshev
1beb24bd6f 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
2013-06-23 15:26:14 -07:00
Damjan Cvetko
a0b4348abc Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket. 2013-06-23 15:20:54 -07:00
Stanislav Malyshev
c593b42a0c Merge branch 'PHP-5.5'
* PHP-5.5:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays
2013-06-23 13:55:03 -07:00
Stanislav Malyshev
7272e3e722 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
2013-06-23 13:54:50 -07:00
Marco Pivetta
f1e37d03c1 Adding test to verify that __sleep can handle parent classes' private members 2013-06-23 13:53:46 -07:00
Marco Pivetta
61fb822d1a Adding test to stabelize keys used when converting objects to arrays 2013-06-23 13:53:37 -07:00
Adam Harvey
f94f17397e Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).
2013-06-23 11:04:36 -07:00
Adam Harvey
296a12efbb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).
2013-06-23 11:04:10 -07:00
Adam Harvey
2531307be6 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
2013-06-23 11:02:00 -07:00
Remi Collet
20dbd27108 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL
2013-06-21 14:11:33 +02:00
Remi Collet
fc898ee0f9 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)
2013-06-21 14:11:04 +02:00
Ard Biesheuvel
9b22faa5b8 Merge branch 'PHP-5.5' 2013-06-21 11:27:23 +02:00
Ard Biesheuvel
162726241c Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	Zend/zend_vm_def.h
2013-06-21 11:26:37 +02:00
Ard Biesheuvel
8623562b02 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
2013-06-21 11:25:23 +02:00
Pierre Joye
4718f892cb Merge branch 'master' of git.php.net:php-src 2013-06-20 22:34:04 +02:00
Pierre Joye
a1d0a869be Merge branch 'PHP-5.5'
* PHP-5.5:
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  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.
  Update git rules (5.5 is stable, 5.3 sec only)
  skip test for bug #64936 when tokenizer not built
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final

Conflicts:
	configure.in
	ext/gd/libgd/gd_interpolation.c
	main/php_version.h
2013-06-20 22:32:52 +02:00
Pierre Joye
c65d663aef fix #65070, bgcolor does not use the same format as the input image with imagerotate 2013-06-20 22:22:07 +02:00
Pierre Joye
876b474c7d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-06-20 22:19:53 +02:00
Pierre Joye
07e52857b5 fix #65070, bgcolor does not use the same format as the input image with imagerotate 2013-06-20 22:19:33 +02:00
Adam Harvey
e41eb5272f Merge branch 'PHP-5.5'
* PHP-5.5:
  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.
2013-06-20 09:43:00 -07:00
Adam Harvey
77c46ba516 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.
2013-06-20 09:39:37 -07:00
Adam Harvey
f5c7fe9202 Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Specifically: php_cli_server_http_reponse_status_code_pair →
php_cli_server_http_response_status_code_pair.
2013-06-20 09:34:21 -07:00
Adam Harvey
283f56af66 Change the search in get_status_string() to correctly handle unknown codes.
This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.

There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.

Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).
2013-06-20 09:31:57 -07:00
Ard Biesheuvel
4cd2b7212f 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
2013-06-20 17:26:05 +02:00
Johannes Schlüter
3e6b312b55 Merge branch 'PHP-5.5' 2013-06-20 11:57:56 +02:00
Johannes Schlüter
94e7549719 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-20 11:57:10 +02:00
Johannes Schlüter
b5978e239e Merge branch 'PHP-5.3' into PHP-5.4 2013-06-20 11:52:29 +02:00
Johannes Schlüter
e4ee921b7e Update git rules (5.5 is stable, 5.3 sec only) 2013-06-20 11:51:21 +02:00
Remi Collet
a964c5def8 Merge branch 'PHP-5.5'
* PHP-5.5:
  skip test for bug #64936 when tokenizer not built
2013-06-20 08:43:11 +02:00
Remi Collet
60afd3fce4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  skip test for bug #64936 when tokenizer not built
2013-06-20 08:42:30 +02:00
Remi Collet
9be591bdb5 skip test for bug #64936 when tokenizer not built 2013-06-20 08:42:07 +02:00
David Soria Parra
f77e3be102 Merge branch 'PHP-5.5'
* PHP-5.5:
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final
2013-06-19 22:14:08 +02:00
David Soria Parra
83fc53acb9 Bump version 2013-06-19 22:11:52 +02:00
David Soria Parra
c1b8fbc112 Update credits 2013-06-19 22:03:18 +02:00
David Soria Parra
8547628fec Merge NEWS from PHP 5.4 branch 2013-06-19 21:54:34 +02:00