Commit Graph

3851 Commits

Author SHA1 Message Date
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Stanislav Malyshev
9e3396b85d 5.4.9-dev 2012-10-03 18:36:17 -07:00
Johannes Schlüter
64c09f68ec PHP-5.3 branch is 5.3.19 now 2012-10-04 02:35:42 +02:00
Gustavo Lopes
2634f55992 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #63240 on stream_get_line()
2012-10-12 20:24:28 +02:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Xinchen Hui
923511d364 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Cherry pick to 5.3
2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107 Merge branch 'PHP-5.4' 2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 2012-09-23 22:59:31 +08:00
Rasmus Lerdorf
fa5477d9d4 Fix folding 2012-09-20 14:24:55 -04:00
Rasmus Lerdorf
2322be0fab Fix folding 2012-09-20 14:22:15 -04:00
Johannes Schlüter
9e91d621e3 This will become 5.3.18 2012-09-13 23:08:30 +02:00
Dmitry Stogov
04789300a4 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
2012-09-10 14:57:45 +04:00
Dmitry Stogov
62d86209cf Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag 2012-09-10 14:54:18 +04:00
Stanislav Malyshev
55b3386a81 update version id too 2012-08-28 22:10:34 -07:00
Stanislav Malyshev
78cffe0c4d 5.4.7 branched 2012-08-28 22:07:08 -07:00
Adam Harvey
14847af41d Update version numbers to 5.4.7-dev. 2012-08-17 23:07:54 +08:00
Stanislav Malyshev
054e41f4ae Merge branch 'PHP-5.4'
* PHP-5.4:
  News for bug#40459
  fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:12:22 -07:00
Stanislav Malyshev
4db70fd406 fix bug #40459 - make all stream funcs that create object call ctor 2012-08-07 22:59:12 -07:00
Stanislav Malyshev
c9eb64127e Merge branch 'pull-request/132'
* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
2012-08-05 21:15:53 -07:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Felipe Pena
d2beb0fc05 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #62525 (sigabrt while converting floating point to string)
2012-07-14 15:15:42 -03:00
Felipe Pena
3728e50e9f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #62525 (sigabrt while converting floating point to string)
2012-07-14 15:15:24 -03:00
Felipe Pena
63f3962a90 - Fixed bug #62525 (sigabrt while converting floating point to string) 2012-07-14 15:15:11 -03:00
Johannes Schlüter
6b2b195267 This wil be PHP 5.3.16 2012-07-05 01:15:27 +02:00
Nikita Popov
d372b33c9b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
2012-06-27 12:28:55 +02:00
Stanislav Malyshev
2065bab102 Merge branch 'PHP-5.4'
* PHP-5.4:
  typo fix
2012-06-10 20:38:58 -07:00
Stanislav Malyshev
b55e69285b typo fix 2012-06-10 20:38:22 -07:00
Stanislav Malyshev
c83457ed13 Merge branch 'PHP-5.4'
* PHP-5.4:
  improve overflow checks
  add NEWS
  fix potential overflow in _php_stream_scandir
2012-06-08 01:23:07 -07:00
Stanislav Malyshev
59eaa7c877 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  improve overflow checks
  fix potential overflow in _php_stream_scandir
2012-06-08 01:22:46 -07:00
Stanislav Malyshev
fc74503792 improve overflow checks 2012-06-08 01:21:37 -07:00
Stanislav Malyshev
426ccd3e7f Merge branch 'PHP-5.4'
* PHP-5.4:
  fix potential overflow in _php_stream_scandir
2012-06-07 23:09:37 -07:00
Stanislav Malyshev
10e8da1738 fix potential overflow in _php_stream_scandir 2012-06-07 23:09:18 -07:00
Stanislav Malyshev
7d04e0fb2e fix potential overflow in _php_stream_scandir 2012-06-07 23:08:35 -07:00
Johannes Schlüter
72a9b595ca PHP 5.3.15-dev 2012-05-16 16:49:35 +02:00
Stanislav Malyshev
be8b1c74cf to 5.4.5-dev 2012-05-15 22:46:49 -07:00
Michael Wallner
2d11e55b94 cleanup merge 2012-05-15 09:44:01 +02:00
Michael Wallner
0ad53bfd7d fix bug #60761 zlib.output_compression fails on refresh 2012-05-15 09:33:47 +02:00
Christopher Jones
d9788dd73f Bump to 5.4.4-dev 2012-05-14 12:43:36 -07:00
Johannes Schlüter
e120a0c7f3 This will be PHP 5.3.14 2012-05-08 11:28:15 +02:00
Nikita Popov
9e1b690e0c Merge branch 'PHP-5.4'
* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 13:33:47 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
Christopher Jones
31ab04ee25 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
2012-05-03 12:22:39 -07:00
Christopher Jones
0956c00af9 Bump to next version
Bump PHP version number
2012-05-03 12:03:49 -07:00
Christopher Jones
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
Xinchen Hui
579d234f50 Merge branch 'PHP-5.4' 2012-04-15 01:17:56 +08:00
Xinchen Hui
3b42f184cd Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx) 2012-04-15 01:16:34 +08:00
Gustavo André dos Santos Lopes
bd5f52fd94 Merge branch '5.4' 2012-04-07 16:34:37 +01:00
Gustavo André dos Santos Lopes
f7d4076785 Merge branch '5.3' into 5.4 2012-04-07 16:34:17 +01:00
Gustavo André dos Santos Lopes
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
Xinchen Hui
7497aa9c4e Merge branch 'PHP-5.4'
* PHP-5.4:
  Update NEWS
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
2012-04-06 22:00:15 +08:00
Xinchen Hui
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
Xinchen Hui
9bf8cd4b34 Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)) 2012-04-06 21:42:40 +08:00
Gustavo André dos Santos Lopes
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
Xinchen Hui
f7bf83546e Fix warning "suggest parentheses around assignment" 2012-04-04 16:35:32 +08:00
Xinchen Hui
06290cc049 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Klaus Silveira
16bd11062e Small performance improvement. The current code is correct, but if it is used inside a long loop or long strings, it's inefficient. 2012-04-02 22:54:57 -03:00
David Soria Parra
cae2556462 Merge branch 'PHP-5.4'
* PHP-5.4:
  Cleanup Safe Mode related comment in SG(request_info)
2012-03-31 09:34:43 +02:00
David Soria Parra
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
reeze
ff8be9845f Cleanup Safe Mode related comment in SG(request_info) 2012-03-31 09:34:08 +02:00
Johannes Schlüter
fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
reeze
abd2b2ee43 - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 06:23:05 +09:00
Gustavo André dos Santos Lopes
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
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Pierre Joye
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
e132db7a57 - 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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
cdc512afb3 - Oops committed old version of the patch in r324020. Fixed. See bug #61253. 2012-03-08 12:39:48 +00:00
Gustavo André dos Santos Lopes
aee85bc163 - Oops committed old version of the patch in r324020. Fixed. See bug #61253. 2012-03-08 12:39:48 +00:00
Gustavo André dos Santos Lopes
b976ebad35 - Oops committed old version of the patch in r324020. Fixed. See bug #61253. 2012-03-08 12:39:48 +00:00
Gustavo André dos Santos Lopes
0169020e49 - 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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Stanislav Malyshev
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
3e6bc8fbce - 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
Gustavo André dos Santos Lopes
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
Pierre Joye
94994104a5 - bump minimum version, no more XP/2003 2012-03-04 15:08:12 +00:00
Ilia Alshanetsky
0fe734b7c8 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Ilia Alshanetsky
5525d80982 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Ilia Alshanetsky
67db5de6b2 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Nikita Popov
f465b219b5 Fix bug #61106 Segfault when using header_register_callback
The callback was double dtored
2012-03-02 08:04:51 +00:00
Nikita Popov
09f24e0850 Fix bug #61106 Segfault when using header_register_callback
The callback was double dtored
2012-03-02 08:04:51 +00:00
Xinchen Hui
2e5e82a8ca MFH: Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars) 2012-03-02 03:18:04 +00:00
Rasmus Lerdorf
02f6937073 Merge: make max_file_uploads PHP_INI_SYSTEM|PHP_INI_PERDIR 2012-03-01 22:49:03 +00:00
Rasmus Lerdorf
995a668eab Merge fix for bug 61193 2012-03-01 22:34:23 +00:00
Stanislav Malyshev
23c62eb080 back to dev 2012-02-29 07:24:27 +00:00
Stanislav Malyshev
bfd72d0386 5.4.0 2012-02-29 07:22:43 +00:00
Rasmus Lerdorf
99c70829a0 Fix bug 61193 2012-02-27 12:16:39 +00:00
Rasmus Lerdorf
4ac6c512f9 Fix bug 61193 2012-02-27 12:16:39 +00:00
Gustavo André dos Santos Lopes
bcefc31e68 - Better fix for #61115.
- Fixed resource leak in stream_socket_client().
2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
911330e62c - Better fix for #61115.
- Fixed resource leak in stream_socket_client().
2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
cde7662226 - 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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
fc134965c8 - Revert r134029. The streams pooling API was never used in more
than 8 years and therefore unnecessarily adds complexity.
2012-02-21 21:55:00 +00:00
Rasmus Lerdorf
8bc24c0046 I think we should let this be settable from .htaccess to match the other post/upload
related limits like upload_max_filesize, post_max_size, and max_input_vars.
2012-02-17 17:54:11 +00:00
Stanislav Malyshev
6561d47e55 back to dev 2012-02-16 07:47:02 +00:00
Stanislav Malyshev
c1d415f798 5.4.0rc8 2012-02-16 07:45:08 +00:00
Stanislav Malyshev
dab17da38a make ZEND_SIGNALS configurable, off by default
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
Stanislav Malyshev
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
Michael Wallner
7a58d9f679 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
Michael Wallner
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
Mateusz Kocielski
ddcf55b640 * fixed bug #60704 unlink() bug with some files path
Reviewed by: rasmus@
2012-02-14 14:14:30 +00:00
Mateusz Kocielski
4d600bda70 * fixed bug #60704 unlink() bug with some files path
Reviewed by: rasmus@
2012-02-14 14:14:30 +00:00
Dmitry Stogov
282d3f2034 Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Dmitry Stogov
04f6171012 Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Dmitry Stogov
2ad7f44b7b Improved max_input_vars directive to check nested variables 2012-02-14 08:58:52 +00:00
Xinchen Hui
3f23b11151 Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars). 2012-02-08 14:07:27 +00:00
Xinchen Hui
6672171672 Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars). 2012-02-08 14:07:27 +00:00
Rasmus Lerdorf
0f6e3408db Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
704c45ec3e Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
0f0261e0b7 Fix for bug 60986 2012-02-06 18:11:56 +00:00
Gustavo André dos Santos Lopes
024e1307c6 - Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and
forbid \0. See bug #60227.
2012-02-03 13:56:37 +00:00
Gustavo André dos Santos Lopes
8e82bda330 - Merging r323033 into 5.3 (see bug #60227). 2012-02-03 08:48:34 +00:00
Gustavo André dos Santos Lopes
f906a015bb - Hopefully correct fix for bug #60227.
#No commit for 5.4 for now
2012-02-02 18:24:53 +00:00
Stanislav Malyshev
9e9683b6b0 back to dev 2012-02-02 17:29:00 +00:00
Stanislav Malyshev
29e2f050f5 retag 5.4.0 rc7 2012-02-02 17:28:03 +00:00
Johannes Schlüter
1e16c821aa This will be PHP 5.3.11, 5.3.10 will be released from other branch 2012-02-02 17:25:23 +00:00
Dmitry Stogov
87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00
Dmitry Stogov
29a909edcc Fixed memory leaks 2012-02-02 10:26:53 +00:00
Dmitry Stogov
cc1829d187 Fixed memory leaks 2012-02-02 10:26:53 +00:00
Dmitry Stogov
89bc5ece51 Fixed memory leaks 2012-02-02 10:26:53 +00:00
Stanislav Malyshev
3a95557cc3 back to dev 2012-02-02 06:09:50 +00:00
Stanislav Malyshev
9e9d6d3aaf 5.4.0 rc7 2012-02-02 06:08:29 +00:00
Stanislav Malyshev
4558f06648 fix UMR in php_register_variable_ex, reported by Stefan Esser 2012-02-01 19:52:05 +00:00
Stanislav Malyshev
40d8cd1f12 fix UMR in php_register_variable_ex, reported by Stefan Esser 2012-02-01 19:52:05 +00:00
Stanislav Malyshev
9cb8f3ad48 fix UMR in php_register_variable_ex, reported by Stefan Esser 2012-02-01 19:52:05 +00:00
Michael Wallner
c64a69c8b8 MFH: r322963
fix headers print to stdout/stderr if no output written; 
fix crashes and invalid usage of output control in cli server while passing by
2012-01-31 09:58:26 +00:00
Michael Wallner
29c8658dc8 fix headers print to stdout/stderr if no output written; need to make some more testsbefore committing to PHP_5_4; fix crashes and invalid usage of output control in cli server while passing by 2012-01-31 08:51:24 +00:00
Michael Wallner
3c03829429 use stderr before, stdout after php_output_startup() and sapi_module.ub_write() after php_output_activate()
- fixes Bug #60920  CLI: php -v on STDERR
- fixes Bug #60923  Failing tests for sapi/cli
2012-01-30 12:17:51 +00:00
Michael Wallner
9de5b6dc7c use stderr before, stdout after php_output_startup() and sapi_module.ub_write() after php_output_activate()
- fixes Bug #60920  CLI: php -v on STDERR
- fixes Bug #60923  Failing tests for sapi/cli
2012-01-30 12:17:51 +00:00
Michael Wallner
bfccc4ed58 fix crash with display_startup_errors=1 2012-01-25 17:22:46 +00:00
Michael Wallner
ef388d1f28 fix crash with display_startup_errors=1 2012-01-25 17:22:46 +00:00
Gustavo André dos Santos Lopes
45a6f8d9a5 - 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.
#withheld commit to 5.4
2012-01-22 20:30:37 +00:00
Gustavo André dos Santos Lopes
f5a4573182 - 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.
#withheld commit to 5.4
2012-01-22 20:30:37 +00:00
Stanislav Malyshev
cbdfc93154 back to dev 2012-01-19 06:29:15 +00:00
Stanislav Malyshev
44c773120e 5.4.0RC6 2012-01-19 06:27:56 +00:00
Dmitry Stogov
ccd1b15bd0 Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Dmitry Stogov
d940f2d38a Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Dmitry Stogov
9025d6219d Fixed workaround for bug #48034 on Windows (Crash when script is 8192 (8KB) bytes long) 2012-01-17 09:30:12 +00:00
Michael Wallner
6b31413b13 Fix bug #60768 Output buffer not discarded
in php_output_handler_op():
  * if appending to buffer succeeds, just return HANDLER_NO_DATA
    and do nothing else
  * if a zero sized string or true is returned from the handler
    function, reset the context as well as the handler's buffer
2012-01-16 17:51:35 +00:00
Michael Wallner
f32760bd40 Fix bug #60768 Output buffer not discarded
in php_output_handler_op():
  * if appending to buffer succeeds, just return HANDLER_NO_DATA
    and do nothing else
  * if a zero sized string or true is returned from the handler
    function, reset the context as well as the handler's buffer
2012-01-16 17:51:35 +00:00
Johannes Schlüter
93ee94adb6 We should be back to -dev ... 2012-01-15 19:51:36 +00:00
Rui Hirokawa
61088ce729 MFH: fixed bug #60227: header() cannot detect the multi-line header with CR. 2012-01-14 07:41:01 +00:00
Johannes Schlüter
c7904620d1 - Fix version number as used in Windows builds for 5.3.9 2012-01-10 13:27:39 +00:00
Johannes Schlüter
3eb4b024ee PHP 5.3.9 2012-01-10 11:21:57 +00:00