mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-18 14:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
82,642 Commits 503 Branches 1,387 Tags 833 MiB
9fea4348fd
Commit Graph

256 Commits

Author SHA1 Message Date
Dmitry Stogov
9fea4348fd cleanup 2014-08-13 16:55:21 +04:00
Dmitry Stogov
4a3e501fb3 cleanup 2014-08-08 13:47:34 +04:00
Dmitry Stogov
16d3d5dc53 Fixed wrong comparisons 2014-05-15 21:06:39 +04:00
Nikita Popov
e0247de147 zend_stack_top() now returns pointer directly 2014-05-01 09:08:30 +02:00
Nikita Popov
5a03efe279 Don't allocate zend_stack elements individually 
Instead allocate a vector of elements. Size must now be specified
on initialization rather than on push.
 2014-05-01 09:08:29 +02:00
Dmitry Stogov
17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
72c287bd23 Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Michael Wallner
bbd25ca01f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix Bug #66736 	fpassthru broken
 2014-04-03 10:40:20 +02:00
Michael Wallner
d08b4dbf23 Fix Bug #66736 fpassthru broken 2014-04-03 10:40:06 +02:00
Dmitry Stogov
76cd829efd Fixed double free 2014-03-19 17:00:58 +04:00
Xinchen Hui
be6e417fdc Fixed memory leak (double array_init) 2014-03-07 17:48:54 +08:00
Xinchen Hui
c2933c234c Fixed invalid pointer usage (tests/output/ob_start_callbacks.phpt) 2014-03-07 16:49:01 +08:00
Xinchen Hui
7c623c0e89 Fixed asseration failed in ob_get_status 2014-03-07 15:12:52 +08:00
Dmitry Stogov
9ae9460bd0 Fixed refcounting 2014-03-06 13:32:26 +04:00
Dmitry Stogov
639e4e1afa Changes zend_is_callable() to use zend_string* instead of char* 2014-02-25 16:03:34 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
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