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
David Soria Parra
2bac1ff137
Reorder NEWS for PHP 5.5.0 final
2013-06-19 21:50:05 +02:00
Pierre Joye
d5b1111fb0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add notes about opcache windows issue and migration from APC
2013-06-19 17:59:30 +02:00
Pierre Joye
0a6ec7a2c9
add notes about opcache windows issue and migration from APC
2013-06-19 17:57:08 +02:00
Anatol Belski
d9f538bc68
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added some tests based on bug #64395
2013-06-19 16:25:08 +02:00
Anatol Belski
2873b5b6eb
added some tests based on bug #64395
2013-06-19 16:24:30 +02:00
Johannes Schlüter
96c1e0440b
Merge branch 'PHP-5.5'
2013-06-19 15:09:45 +02:00
Johannes Schlüter
c6b8d992ba
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-19 15:09:33 +02:00
Johannes Schlüter
0e55d3a12a
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-19 15:09:04 +02:00
Johannes Schlüter
f0eaa02f6f
This will be PHP 5.3.28
2013-06-19 15:08:02 +02:00
Remi Collet
04b2f8d53e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Related to bug #65047 (Test skip on client / server version)
2013-06-19 12:27:12 +02:00
Remi Collet
fb68e0fe63
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Related to bug #65047 (Test skip on client / server version)
2013-06-19 12:26:53 +02:00
Remi Collet
67bde2f8ac
Related to bug #65047 (Test skip on client / server version)
...
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)
bug_49985.phpt
Make result "locale" independent
2013-06-19 12:26:21 +02:00
Matteo Beccati
77032bcd9c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65047 (Test skip on client / server version)
Remove broken client version checking
Clean up leftover file after the test
2013-06-19 11:53:21 +02:00
Matteo Beccati
9b8259cdfa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65047 (Test skip on client / server version)
Remove broken client version checking
Clean up leftover file after the test
2013-06-19 11:53:05 +02:00
Matteo Beccati
c666239265
Fixed bug #65047 (Test skip on client / server version)
2013-06-19 11:48:03 +02:00
Matteo Beccati
25e9aa6b0a
Remove broken client version checking
2013-06-19 11:48:03 +02:00
Matteo Beccati
5edd530511
Clean up leftover file after the test
2013-06-19 11:48:03 +02:00
Stanislav Malyshev
07a38ea80c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
sync NEWS
2013-06-18 23:09:36 -07:00
Stanislav Malyshev
7b08c7f4e7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
sync NEWS
2013-06-18 23:09:29 -07:00
Stanislav Malyshev
e2bb74ab4f
sync NEWS
2013-06-18 23:06:20 -07:00
Stanislav Malyshev
a984dd4eb4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
5.4.18 next
2013-06-18 22:59:34 -07:00
Stanislav Malyshev
59d4d41efb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.18 next
Conflicts:
configure.in
main/php_version.h
2013-06-18 22:59:26 -07:00
Stanislav Malyshev
dda3f404ec
5.4.18 next
2013-06-18 22:58:11 -07:00
Xinchen Hui
ce1cb1f7a6
Merge branch 'PHP-5.5'
2013-06-19 11:17:55 +08:00
Xinchen Hui
bb9928c343
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-19 11:17:44 +08:00