0956c00af9
Bump to next version
...
Bump PHP version number
2012-05-03 12:03:49 -07:00
701332ce30
Update to 5.4.2-dev
...
After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
2012-04-19 10:45:21 -07:00
3b42f184cd
Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)
2012-04-15 01:16:34 +08:00
f7d4076785
Merge branch '5.3' into 5.4
2012-04-07 16:34:17 +01:00
0f180a63eb
Fixed bug in new stream_get_line() when using NUL as a delimiter.
...
This is the issue Derick spotted a few days ago..
2012-04-07 16:32:19 +01:00
b0f09b69d3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
2012-04-06 21:57:56 +08:00
9bf8cd4b34
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
2012-04-06 21:42:40 +08:00
ca58cd01fc
Cherry-pick 4cc74767
...
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227 .
Conflicts:
ext/standard/tests/general_functions/bug60227.phpt
ext/standard/tests/general_functions/bug60227_1.phpt
ext/standard/tests/general_functions/bug60227_2.phpt
main/SAPI.c
2012-04-04 09:59:51 +01:00
f7bf83546e
Fix warning "suggest parentheses around assignment"
2012-04-04 16:35:32 +08:00
efd671f242
Fixed bug Fixed bug #61605 (header_remove() does not remove all headers)
2012-04-04 16:14:28 +08:00
896c4539df
Fixed bug #61605 (header_remove() does not remove all headers)
2012-04-04 16:01:43 +08:00
3bf53aa911
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Cleanup Safe Mode related comment in SG(request_info)
2012-03-31 09:34:25 +02:00
ff8be9845f
Cleanup Safe Mode related comment in SG(request_info)
2012-03-31 09:34:08 +02:00
fb124764de
This will be PHP 5.3.12
2012-03-29 11:22:44 +02:00
abd2b2ee43
- fix bug #61541 , Segfault when using ob_* in output_callback
2012-03-29 06:23:05 +09:00
2d2995f343
Fixed bug #61043 : Regression in magic_quotes_gpc fix (CVE-2012-0831)
...
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3
Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net >
2012-03-21 21:12:31 +00:00
d1fd5432e1
Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
2012-03-21 08:44:59 +01:00
95dcd799fb
- merge fix bug #54374 , bug #55500 - filter file names better, no dangling [s, svn revision 321664
2012-03-21 06:58:55 +01:00
9a460497da
MFH: 45a6f8d for 5.4.
...
- Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
already sufficient data buffered). stream_get_line() now behaves more like
fgets(), as is documented.
2012-03-19 16:34:31 +00:00
d974e44248
- Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
...
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
fixing bug #61115 . This better fix for #61115 fixes the leak (the inhibition
for deleting the context was too broad) and so prevents segfaults in new
circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
ef19fba2d5
- Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
...
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
fixing bug #61115 . This better fix for #61115 fixes the leak (the inhibition
for deleting the context was too broad) and so prevents segfaults in new
circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
aee85bc163
- Oops committed old version of the patch in r324020. Fixed. See bug #61253 .
2012-03-08 12:39:48 +00:00
b976ebad35
- Oops committed old version of the patch in r324020. Fixed. See bug #61253 .
2012-03-08 12:39:48 +00:00
7166298d63
- Fixed bug #61253 : Wrappers opened with errors concurrency problem
...
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
f413b3726c
- Fixed bug #61253 : Wrappers opened with errors concurrency problem
...
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
4cc747677c
MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227 .
2012-03-07 07:49:56 +00:00
02592974b4
- size_t may be shorter than long and definitely is not signed. Note that the
...
z modifier was only added in C99, so we can't use it.
2012-03-04 19:30:01 +00:00
32c5643f6b
- size_t may be shorter than long and definitely is not signed. Note that the
...
z modifier was only added in C99, so we can't use it.
2012-03-04 19:30:01 +00:00
0fe734b7c8
Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths)
2012-03-03 20:36:14 +00:00
5525d80982
Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths)
2012-03-03 20:36:14 +00:00
09f24e0850
Fix bug #61106 Segfault when using header_register_callback
...
The callback was double dtored
2012-03-02 08:04:51 +00:00
2e5e82a8ca
MFH: Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars)
2012-03-02 03:18:04 +00:00
02f6937073
Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR
2012-03-01 22:49:03 +00:00
995a668eab
Merge fix for bug 61193
2012-03-01 22:34:23 +00:00
23c62eb080
back to dev
2012-02-29 07:24:27 +00:00
bfd72d0386
5.4.0
2012-02-29 07:22:43 +00:00
99c70829a0
Fix bug 61193
2012-02-27 12:16:39 +00:00
bcefc31e68
- Better fix for #61115 .
...
- Fixed resource leak in stream_socket_client().
2012-02-24 22:56:21 +00:00
eb1ada852d
- Fixed bug #61115 (stream related segfault on fatal error in
...
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
2012-02-22 11:45:26 +00:00
6561d47e55
back to dev
2012-02-16 07:47:02 +00:00
c1d415f798
5.4.0rc8
2012-02-16 07:45:08 +00:00
fa9540e1f1
make ZEND_SIGNALS configurable, off by default
...
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
685a3c86c2
fix compat function not passing along input buffer with php_output_context_pass() if the output_handler_func does not set out_str
2012-02-14 19:31:54 +00:00
ddcf55b640
* fixed bug #60704 unlink() bug with some files path
...
Reviewed by: rasmus@
2012-02-14 14:14:30 +00:00
282d3f2034
Improved max_input_vars directive to check nested variables
2012-02-14 08:58:52 +00:00
04f6171012
Improved max_input_vars directive to check nested variables
2012-02-14 08:58:52 +00:00
3f23b11151
Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars).
2012-02-08 14:07:27 +00:00
0f6e3408db
Fix for bug 60986
2012-02-06 18:11:56 +00:00
0f0261e0b7
Fix for bug 60986
2012-02-06 18:11:56 +00:00
8e82bda330
- Merging r323033 into 5.3 (see bug #60227 ).
2012-02-03 08:48:34 +00:00
Christopher Jones