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
84,889 Commits 549 Branches 1,485 Tags
c343ca4efba7e600f7d20c73fde34dbda8192e48
Commit Graph

247 Commits

Author SHA1 Message Date
Adam Harvey d91717f458 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now
 2014-09-08 19:31:58 +00:00
Adam Harvey 0cbfdc9df5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now

Conflicts:
	configure.in
	main/php_version.h
 2014-09-08 19:28:15 +00:00
Adam Harvey bc44eb6172 Fix bug #67972 (SessionHandler Invalid memory read create_sid()). 
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
 2014-09-08 19:25:14 +00:00
Tjerk Meesters 86674b5837 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #67694: Regression in session_regenerate_id()

Conflicts:
	ext/session/session.c
 2014-08-23 09:21:36 +08:00
Tjerk Meesters ce9bdae33f Fixed #67694: Regression in session_regenerate_id() 2014-08-23 09:18:02 +08:00
Anatol Belski 4b337a898b fix directory separator in test 2014-08-20 21:27:39 +02:00
Dmitry Stogov f2a2fccece Merge branch 'master' into phpng 
* master:
  fix nmake snap when ext name is different in target dll
  force atoll macro usage on windows
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  See bug #67635
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
  Improve fix for #66608
  Fixed segfault with empty break
  New added opcodes don't need to be resloved
  Update NEWS
  Update NEWS
  Update NEWS
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
  implemented copy libs of core exts in phpize mode
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode

Conflicts:
	Zend/zend_opcode.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/session/session.c
 2014-07-22 15:42:17 +04:00
Xinchen Hui 9bef96d96e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 13:12:36 +08:00
Yasuo Ohgaki 5ed63b3bfc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
 2014-07-19 10:00:10 +09:00
Yasuo Ohgaki d0d5a1c444 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
 2014-07-19 09:59:51 +09:00
Yasuo Ohgaki f83a6c33b4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
 2014-07-19 09:53:04 +09:00
Yasuo Ohgaki e946de29d2 Fixed bug #66827 Session raises E_NOTICE when session name variable is array 2014-07-19 09:52:31 +09:00
Dmitry Stogov 8ce2f2caac Merge branch 'master' into phpng 
* master:
  Fix still broken session test.  Only return true/false.
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
  Followup fix to custom session save handlers
  create locales and re-add test
  rm test for now

Conflicts:
	ext/session/tests/session_set_save_handler_class_012.phpt
 2014-07-08 11:32:29 +04:00
Sara Golemon 6e9bc95f67 Fix still broken session test. Only return true/false. 2014-07-07 14:30:28 -07:00
Sara Golemon 7c2489751c Followup fix to custom session save handlers 
2d9885c introduced some regressions.  This addresses those.

  * Don't throw return type notice or session write failure when in an exception
  * Fix tests to properly return true/false since null is no longer falsy/successy
  * Rerecord a few tests to accomodate difference in raised warnings
 2014-07-07 12:59:54 -07:00
Dmitry Stogov e4450cddd4 Wrong expectation in test (for some reason error messages didn't refer to right functions) 2014-07-07 17:22:19 +04:00
Ferenc Kovacs f63ca453e0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test (it requires ext/hash)
 2014-05-07 01:00:01 +02:00
Ferenc Kovacs 8e2d396b52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test (it requires ext/hash)
 2014-05-07 00:55:05 +02:00
Dmitry Stogov 8517001b25 Fixed test (it requires ext/hash) 2014-05-07 00:52:49 +02:00
Ferenc Kovacs 0cd679fb17 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
 2014-05-07 00:39:57 +02:00
Ferenc Kovacs d2f283884f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
 2014-05-07 00:38:57 +02:00
Ferenc Kovacs 579898e338 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
 2014-05-07 00:38:32 +02:00
Dmitry Stogov f880013c4d Fixed tests (they might fail from time to time because of session GC) 2014-05-07 00:37:56 +02:00
Martin Jansen c0f4e270a8 This test requires the hash extension. 2014-05-06 21:34:10 +02: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 dac8cefb45 Fixed tests (added session_destroy() to avoid side effects on the following tests) 2014-04-11 13:17:59 +04:00
Dmitry Stogov 4adedff13d Fixed tests (they might fail from time to time because of session GC) 2014-04-11 12:43:35 +04:00
Xinchen Hui 70ba20bfd3 hmm, make it consistent 2014-04-11 12:54:42 +08:00
Xinchen Hui 12470b4092 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-04-11 12:34:06 +08:00
Dmitry Stogov 23aecd1736 Fixed test (it requires ext/hash) 2014-04-10 12:14:11 +04:00
Xinchen Hui 27f7f342ee session_id is binary safe now 2014-04-10 11:57:34 +08:00
Yasuo Ohgaki 973f379efc Remove unneeded test 2014-03-13 06:54:52 +09:00
Yasuo Ohgaki 6f0ad9ea12 Revert "Implement Bug #54649 Create session_serializer_name()" 
This reverts commit 678ec30655.

Conflicts:
	ext/session/tests/session_serializer_name_basic.phpt
 2014-03-13 06:32:49 +09:00
Anatol Belski 1cb4398ac1 primitive test fixes 2014-02-28 09:43:57 +01:00
Anatol Belski 698b04270e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  refixed that test for 5.5+
  5.5.10 next
 2014-01-22 23:30:52 +01:00
Anatol Belski c0fcd3d6b0 refixed that test for 5.5+ 2014-01-22 23:30:14 +01:00
Anatol Belski f8e9f84a97 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
 2014-01-22 15:40:58 +01:00
Anatol Belski 0436b85d9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed test
 2014-01-22 15:40:19 +01:00
Anatol Belski 0eff7176de fixed test 2014-01-22 15:39:49 +01:00
Yasuo Ohgaki 58f94345a7 Fixed previous commit may delete unwanted cookies. Sync tests from upper branches. 2014-01-22 19:21:25 +09:00
Yasuo Ohgaki 26a2bed185 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Re-fixed bug #66469
 2014-01-22 13:47:55 +09:00
Yasuo Ohgaki 383423a1ee Re-fixed bug #66469 2014-01-22 13:46:59 +09:00
Yasuo Ohgaki a27e51fd4e Re-fixed bug #66469 2014-01-22 13:40:58 +09:00
Anatol Belski 8b703e9ee0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked the test for bug #66481
 2014-01-17 03:32:06 +01:00
Anatol Belski 14e371e7d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  forked the test for bug #66481
 2014-01-17 03:31:38 +01:00
Anatol Belski a218a8b917 forked the test for bug #66481 2014-01-17 03:30:42 +01:00
Xinchen Hui bfcdd67865 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-16 14:42:04 +08:00
Xinchen Hui 9799816e0c Merge branch 'PHP-5.4' into PHP-5.5 2014-01-16 14:41:52 +08:00
Xinchen Hui b777248ded Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null) 2014-01-16 14:41:12 +08:00
Xinchen Hui 271053ad47 Revert "Bug #66481 Segfaults on session_name()" 
This reverts commit 5662ffb295.
 2014-01-16 14:38:35 +08:00