php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,111 Commits 549 Branches 1,485 Tags
9df1dcd32909fa347dbec59cb5754b1bb5bee44a
Commit Graph

45 Commits

Author SHA1 Message Date
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
Felipe Pena fd96831f68 Merge branch 'PHP-5.6' 
* PHP-5.6:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2014-04-22 10:49:18 -03:00
George Wang 742f4704a9 sapi/litespeed/lsapi_main.c: Fix bug #63228 
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
 2014-04-22 10:48:14 -03:00
Dmitry Stogov 050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Kalle Sommer Nielsen ed5a8d510f Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs 2013-12-18 09:06:39 +01:00
George Wang 9960ecc5cd update to LSAPI 6.6 2013-11-26 18:53:35 -05:00
George Wang 01bc13212e Update LiteSpeed SAPI code to V6.4 2013-11-05 16:14:49 -05:00
George Wang 3720fd77b5 Fixed typo in Makefile.frag 2013-11-05 16:12:24 -05:00
Veres Lajos 1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
George Wang 1407b4a080 Merge branch '5.4' 
* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2012-10-12 13:29:37 -04:00
George Wang 68e528a6bc Merge branch '5.3' into 5.4 
* 5.3:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2012-10-12 13:09:53 -04:00
George Wang 22611b8d37 sapi/litespeed/lsapi_main.c: Fix bug #63228 
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
 2012-10-12 13:04:22 -04:00
Xinchen Hui 63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui 9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
George Wang f9d84f4f6b fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:22 +00:00
George Wang 3c1df3349a fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:06 +00:00
George Wang 25ccd72217 keep code to be compatible with PHP4 2011-11-16 04:00:28 +00:00
George Wang 56728f11a8 keep code to be compatible with PHP4 2011-11-16 03:58:57 +00:00
George Wang dfd357db55 keep PHP_5_4 in sync with PHP_5_3 branch 2011-11-16 03:46:54 +00:00
George Wang badd6a91d4 keep PHP_5_4 in sync with PHP_5_3 branch 2011-11-16 03:44:42 +00:00
Adam Harvey f11500df0c Fix bug #55769 (Make Fails with "Missing Separator" error) via s/ /^I/. 2011-09-24 19:16:33 +00:00
Adam Harvey f75c7302cb Fix bug #55769 (Make Fails with "Missing Separator" error) via s/ /^I/. 2011-09-24 19:16:33 +00:00
Stanislav Malyshev 23ad275e24 MF53 2011-07-12 04:58:55 +00:00
Stanislav Malyshev 4a5959d113 MF53 2011-07-12 04:58:55 +00:00
Stanislav Malyshev 3f0abb300c MF53 2011-07-12 04:45:38 +00:00
Stanislav Malyshev 46407e6f5e MF53 2011-07-12 04:45:38 +00:00
George Wang 0bcbaa1750 fix socket address parsing code 2011-06-08 16:51:59 +00:00
George Wang cb7f656de7 fix CLI mode timeout 2011-05-31 22:40:42 +00:00
Pierrick Charron 1368364469 Fix common typos in the source code (Reported in Bug #54065) 
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
 2011-04-03 21:46:52 +00:00
Pierrick Charron e8486cc374 Fix common typos in the source code (Reported in Bug #54065) 
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
 2011-04-03 21:46:52 +00:00
George Wang cccba0fa4d fixed keyLen validation point 2010-12-10 22:51:08 +00:00
Jani Taskinen 25aee9cad9 - Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time) 
# Bug #53271, Bug #52410
 2010-11-13 23:13:07 +00:00
Kalle Sommer Nielsen 34b631f679 Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's 2010-08-18 13:34:40 +00:00
George Wang 6106c44c10 applied patch from bug report 51452 2010-07-07 20:03:04 +00:00
Felipe Pena 80926568f1 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) 2010-06-26 16:03:39 +00:00
Felipe Pena e64734f986 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) 2010-06-26 16:03:39 +00:00
George Wang 22badf88b0 make STDOUT function as STDERR, in case any module call print() 2009-02-27 23:33:01 +00:00
George Wang ffe4bd566f *** empty log message *** 2008-09-21 02:38:32 +00:00
George Wang 0f4f00e3ae disable core dump by default 2008-09-21 02:34:08 +00:00
George Wang f091e745c9 ignore signal SIGXFSZ 2008-08-26 22:05:17 +00:00
Nuno Lopes 9732c409a4 fix this, so that I can build php without litespeed.. 2008-08-07 19:32:15 +00:00
George Wang 7c7bb11bcd use PHP_ARG_WITH instead of AC_ARG_WITH 2008-08-07 16:41:31 +00:00
George Wang 52604d2832 added litespeed SAPI 2008-08-05 22:37:32 +00:00