mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 22:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
72,313 Commits 503 Branches 1,387 Tags 833 MiB
093d119597
Commit Graph

233 Commits

Author SHA1 Message Date
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Michael Wallner
575790e842 fix bug #61272 ob_start callback get passed empty string 2012-11-28 10:19:44 +01: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
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
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
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
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
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Michael Wallner
db51b6b84b follow naming convention 2011-12-30 09:20:07 +00:00
Michael Wallner
ecfb3af78f follow naming convention 2011-12-30 09:20:07 +00:00
Dmitry Stogov
8de2aa24b6 Added an API call to return active output handler 2011-12-30 08:50:49 +00:00
Dmitry Stogov
f7942c9e63 Added an API call to return active output handler 2011-12-30 08:50:49 +00:00
Stanislav Malyshev
63e5f97da4 fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist) 2011-12-26 05:01:46 +00:00
Stanislav Malyshev
87b9f7bb3a fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist) 2011-12-26 05:01:46 +00:00
Pierrick Charron
52ca90428d Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty). 2011-11-18 00:16:58 +00:00
Pierrick Charron
8e2dcfd8b6 Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty). 2011-11-18 00:16:58 +00:00
Xinchen Hui
efd3e69511 Fixed bug #60282 (Segfault when using ob_gzhandler() with open buffers) 2011-11-13 04:11:57 +00:00
Xinchen Hui
89feaefce1 Fixed bug #60282 (Segfault when using ob_gzhandler() with open buffers) 2011-11-13 04:11:57 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Dmitry Stogov
e43ff1359e Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Michael Wallner
70c284009d fix coverity issue 1054: missing break/return 2011-08-10 11:01:09 +00:00
Michael Wallner
daccb503b2 fix coverity issue 1054: missing break/return 2011-08-10 11:01:09 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Jani Taskinen
72ae65bc9d - CS and "de-facto" style of returning NULL for failing parse-params, sync partially with PHP_5_3 too (reordering part :) 2010-12-03 15:34:24 +00:00
Michael Wallner
823d7cb55f explicitness FTW; it should have been like that before, so it wouldn't have happened 2010-11-03 08:35:16 +00:00
Gustavo André dos Santos Lopes
743f50927c - Fixed bug #53153 (memory leak with phpinfo() + output buffering + zlib compression). 2010-11-02 03:49:49 +00:00
Dmitry Stogov
caffc1c972 Preallocate zend_hash instead of allocation/deallocation it on each request 2010-08-27 06:09:18 +00:00
Antony Dovgal
9d65730961 fix minor memleak 2010-06-09 11:04:03 +00:00
Michael Wallner
99da695ec9 fix cxx build 2010-06-02 12:49:12 +00:00
Michael Wallner
43154f2a7c * raise warning if zend_fcall_info_init() cannot resolve the callback 
* fix pointer mismatch
 2010-06-01 13:16:33 +00:00
Michael Wallner
11d24c1593 * implement new output API, fixing some bugs and implementing some feature 
requests--let's see what I can dig out of the bugtracker for NEWS--
  and while crossing the road:
   * implemented new zlib API
   * fixed up ext/tidy (what was "s&" in zend_parse_parameters() supposed to do?)

Thanks to Jani and Felipe for pioneering.
 2010-05-31 10:29:43 +00:00
Jani Taskinen
af49e58f51 - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00
Jani Taskinen
06f072cb5e MFH: Improved / fixed output buffering (Michael Wallner) 2010-03-11 10:24:29 +00:00
Pierre Joye
5eb4db5e8f - Ensure that stderr output are not buffered, portability for tests 2010-01-25 14:47:19 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Dmitry Stogov
b4ba7fb96e Fixed memory leak 2009-09-21 11:22:13 +00:00
Christian Seiler
3470a30125 - Fixed memory leak in ob_get_clean/ob_get_flush. 
# Not necessary in HEAD because output buffering was completely rewritten
# there.
 2009-03-25 23:59:45 +00:00
David Coallier
2e5f11b841 - Fixed bug #46897: ob_flush() should fail to flush unerasable buffers 
- Added test for bug46897
- A memleak has been identified while fixing this bug but the changes
  made by this commit do not affect ob_get_clean where the memleak (which
  is fixed in HEAD with the new handler) resides.
- [DOC] New noticed is outputted in ob_flush when the buffer is unerasable
 2009-02-13 11:48:17 +00:00
Felipe Pena
c7ef31aefb - Checking 0 param in the new way [only in this branch] 2009-01-07 18:34:18 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00