1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Commit Graph

87629 Commits

Author SHA1 Message Date
Dmitry Stogov 721fc9e80d Added new test 2015-01-29 21:43:28 +03:00
Dmitry Stogov 15a23b1218 Reimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc/php7_foreach#implementation_details) 2015-01-29 21:05:02 +03:00
Dmitry Stogov 10a3260b1f New test 2015-01-29 21:04:44 +03:00
Dmitry Stogov 2705d17c93 Merge branch 'master' into foreach
* master:
  reorder the branches
  ppid must be IS_STRING
  Use proper type
  The argument must be not changed in session_start
  Fixed annoying warnings
  Cleanup session id files after test
  Fixed Bug #68941 mod_files.sh is a bash-script
  Remove support for hex number from is_numeric_string
  add imap
  Update News
  Fixed bug #68901 (use after free)
  Remove legacy code
  Forgot to apply important peace of patch
  Fixed crash
  Fixed some annoying warnings
  Fix typo in doc
  Update UPGRADING and UPGRADING.INTERNALS
  Make session_decode return FALSE when it fails. Fix a test. Use proper types.
  WIP - test passes
2015-01-29 08:26:52 +03:00
Xinchen Hui d96eb4b0a8 reorder the branches 2015-01-29 12:50:56 +08:00
Xinchen Hui 18c647cce2 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-29 12:35:44 +08:00
Xinchen Hui 14396a3264 ppid must be IS_STRING 2015-01-29 12:35:18 +08:00
Yasuo Ohgaki 70b2d2eefa Use proper type 2015-01-29 13:31:40 +09:00
Xinchen Hui 4da7e4de29 The argument must be not changed in session_start 2015-01-29 12:26:13 +08:00
Xinchen Hui a1d9ceac7a Fixed annoying warnings 2015-01-29 11:59:37 +08:00
Yasuo Ohgaki e727d640f7 Merge branch 'pull-request/1016'
* pull-request/1016:
Implement RFC: Introduce session_start() options
2015-01-29 12:03:58 +09:00
Yasuo Ohgaki 7a97eaf25d Cleanup session id files after test 2015-01-29 10:31:39 +09:00
Yasuo Ohgaki f90f6108c8 Merge branch 'master' into master-rfc-session-lock4
Conflicts:
	UPGRADING
2015-01-29 09:55:36 +09:00
Yasuo Ohgaki 14d68d3641 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:31:21 +09:00
Yasuo Ohgaki 5f28622e09 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:29:11 +09:00
Yasuo Ohgaki abf9e2ea09 Fixed Bug #68941 mod_files.sh is a bash-script 2015-01-29 09:25:28 +09:00
Nikita Popov d133e68bab Remove support for hex number from is_numeric_string 2015-01-28 22:54:17 +01:00
Stanislav Malyshev 14d6de97c5 add imap 2015-01-28 10:15:11 -08:00
Xinchen Hui b7751630d1 Merge branch 'PHP-5.6'
Conflicts:
	ext/phar/phar_object.c
2015-01-29 00:02:03 +08:00
Xinchen Hui 659395e3dd Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-29 00:01:24 +08:00
Xinchen Hui c06f1590a9 Update News 2015-01-29 00:01:13 +08:00
Xinchen Hui 5208113ad1 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-29 00:01:00 +08:00
Xinchen Hui b2cf3f064b Fixed bug #68901 (use after free) 2015-01-29 00:00:09 +08:00
Dmitry Stogov 994d4350d3 Merge branch 'master' into foreach
* master:
  fix unportable dereferencing
  fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
2015-01-28 17:34:20 +03:00
Anatol Belski 4d16937449 fix unportable dereferencing 2015-01-28 15:15:38 +01:00
Dmitry Stogov eef80c5837 Fixed foreach by reference iteration over constant array 2015-01-28 16:52:21 +03:00
Popa Adrian Marius be29cb15a6 Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src:
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
2015-01-28 15:39:58 +02:00
Popa Adrian Marius b9868f23a0 fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed 2015-01-28 15:39:42 +02:00
Dmitry Stogov 61e7391873 Fixed temporary variable re-allocation pass 2015-01-28 14:59:54 +03:00
Dmitry Stogov 92e90c09f0 Fixed operand destruction in case of exceptions in iterator 2015-01-28 12:44:57 +03:00
Xinchen Hui a0cf025134 Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20) 2015-01-28 17:12:23 +08:00
Dmitry Stogov dd2a36a207 Use GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE) 2015-01-28 10:02:34 +03:00
Yasuo Ohgaki e71099bc4e Remove legacy code 2015-01-28 16:01:10 +09:00
Yasuo Ohgaki 4d747b1356 Forgot to apply important peace of patch 2015-01-28 14:22:22 +09:00
Dmitry Stogov 4638f7b914 Change "foreach" statement behavior (this is just a PoC yet)
- "foreach by value" don't relay on internal array/object pointer and doesnt perform array duplication. It just locks it incrementing reference counter. If the original array is modified by some code, the copy on write is performed and "foreach" still work with the old copy.

- it makes no difference if array given to "foreach by value" is reference itself

- "foreach by reference" still use internal array/object pointer and should work similar to PHP-5. (This id not completely implemented)
2015-01-28 07:43:28 +03:00
Dmitry Stogov 638d0cb753 Merge branch 'typed_returns' of github.com:morrisonlevi/php-src into test
* 'typed_returns' of github.com:morrisonlevi/php-src:
  Implement return types
2015-01-28 06:56:19 +03:00
Xinchen Hui f2f98e51e1 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-28 10:55:25 +08:00
Yasuo Ohgaki feeaaa4c3f Fixed crash 2015-01-28 08:03:37 +09:00
Stanislav Malyshev 598c935245 update the .re file for PDO 2015-01-27 13:48:24 -08:00
Levi Morrison c8576c5a46 Implement return types
RFC is documented here: https://wiki.php.net/rfc/return_types
2015-01-27 11:49:56 -07:00
Daniel Lowrey 7d663aa90c Merge branch 'windows-ssl-timeout-fix' 2015-01-27 13:23:58 -05:00
Daniel Lowrey 4965fe7fb8 Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix
Conflicts:
	ext/openssl/xp_ssl.c
2015-01-27 13:22:47 -05:00
Stanislav Malyshev 0290571ccf bump the API no 2015-01-27 09:22:20 -08:00
Xinchen Hui 1828ec21e2 Fixed some annoying warnings 2015-01-27 23:28:31 +08:00
Xinchen Hui 95142d9015 Merge branch 'PHP-5.6' 2015-01-27 22:25:55 +08:00
Xinchen Hui b881de9937 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:25:45 +08:00
Xinchen Hui 4c5995b172 fcgi_write in fpm returns ssizt_t, but it returns int in cgi 2015-01-27 22:25:38 +08:00
Xinchen Hui 737b6f69e3 Merge branch 'PHP-5.6' 2015-01-27 22:20:17 +08:00
Xinchen Hui 92d56b0af6 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:20:03 +08:00
Xinchen Hui c3ff9aa17d Revert previous unintentional change to this 2015-01-27 22:19:11 +08:00