php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
95,865 Commits 549 Branches 1,486 Tags
20560da118f888ff4fdcd0ec88aea8a3f911eff4
Commit Graph

95865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov 20560da118 Merge branch 'PHP-7.0' 
Conflicts:
	ext/reflection/php_reflection.c
 2016-05-10 12:17:54 +02:00
Nikita Popov e6d4a9e2d2 Don't HT_ASSERT rc=1 in zend_hash_apply functions 
These are not necessarily used to modify the hash. Move the assert
into the APPLY_REMOVE branch only.
 2016-05-10 12:14:08 +02:00
Nikita Popov a1ed4ab3ca Fixed bug #72174 
Also fixes a memory leak if ::getValue() is used with __get().
 2016-05-10 12:13:10 +02:00
Anatol Belski f9bead7a59 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  update NEWS
 2016-05-09 18:52:21 +02:00
Anatol Belski 3407931108 update NEWS 2016-05-09 18:51:54 +02:00
Anatol Belski a430f8a562 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-05-09 18:51:25 +02:00
Anatol Belski 0ea2bfb30e update NEWS 2016-05-09 18:50:40 +02:00
Anatol Belski 148fa6bb44 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"
  Revert "Backport patch for bug #71820"
 2016-05-09 17:29:56 +02:00
Anatol Belski fc2a45b70a Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor" 
This reverts commit b4eedd128b.

This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
 2016-05-09 17:25:53 +02:00
Anatol Belski 692c262526 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Revert "Backport patch for bug #71820"
 2016-05-09 17:23:40 +02:00
Anatol Belski 1cc536af5a Revert "Backport patch for bug #71820" 
This reverts commit 1b632cfe83.

This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
 2016-05-09 17:15:40 +02:00
Anatol Belski 7b65346b66 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #64524 Add intl.use_exceptions to php.ini-*
 2016-05-08 15:13:01 +02:00
Anatol Belski f152c3fa57 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #64524 Add intl.use_exceptions to php.ini-*
 2016-05-08 15:12:20 +02:00
Anatol Belski 41b159fd11 Fixed bug #64524 Add intl.use_exceptions to php.ini-* 2016-05-08 15:09:50 +02:00
Xinchen Hui 9e404927a6 Merge branch 'PHP-7.0' 2016-05-07 22:05:05 -07:00
Xinchen Hui b62f7e338d Remove unnecessary strlen check 2016-05-07 22:04:31 -07:00
Xinchen Hui 69adf2370e Fixed test 2016-05-07 22:04:20 -07:00
Bob Weinand d33e71b358 Fix include_once in phpdbg 2016-05-07 14:45:41 +02:00
Xinchen Hui 455eabcd2c Merge branch 'PHP-7.0' 2016-05-07 00:08:35 -07:00
Xinchen Hui 29079f263e Strlen cleanup (additions for previous one fix) 
Probably compilers will do similar optimization
 2016-05-07 00:08:15 -07:00
Xinchen Hui 93e5d56617 Merge branch 'patch-1' of https://github.com/Valkyrurr/php-src 2016-05-06 23:55:13 -07:00
Xinchen Hui 2c992032ce Merge branch 'PHP-7.0' 2016-05-06 23:54:48 -07:00
Xinchen Hui f7439afeda Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_strtod.c
 2016-05-06 23:52:48 -07:00
Xinchen Hui 1c7f608071 Fixed bug #72172 (zend_hex_strtod should not use strlen) 2016-05-06 23:52:06 -07:00
Xinchen Hui ed0eb2bfdd Merge branch 'PHP-7.0' 
* PHP-7.0:
  Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"
 2016-05-06 20:25:43 +08:00
Xinchen Hui 197470b62f Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)" 
This reverts commit 459a7cc209.
 2016-05-06 20:25:24 +08:00
Xinchen Hui 9a43e3f4bf Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
  Add $http_response_header tests
 2016-05-06 18:48:28 +08:00
Xinchen Hui 10f8ca9151 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72170 (JsonSerializable may inc apply count without dec it)
 2016-05-06 18:39:18 +08:00
Xinchen Hui 459a7cc209 Fixed bug #72170 (JsonSerializable may inc apply count without dec it) 
I don't want use zend_try here, but seems I have no choice :<
 2016-05-06 18:38:26 +08:00
Nikita Popov 8ba694ebbd Add $http_response_header tests 
Looks like we didn't have a single test for this functionality :/
 2016-05-06 12:37:21 +02:00
Dmitry Stogov 8ae695cd75 Fixed possible crash 2016-05-06 12:36:21 +03:00
Dmitry Stogov cca2c8ecc4 Reimplemented Bob's commit bac6fdb0c5 without insignificant renaming and white-space changes 2016-05-06 10:47:58 +03:00
Dmitry Stogov 37c8711f49 Fixed typo 2016-05-06 10:47:58 +03:00
Dmitry Stogov c19cb70dac Revert "Refactor zval cleanup into single function" 
This reverts commit bac6fdb0c5.
 2016-05-06 10:47:58 +03:00
Anatol Belski cb4750f52d Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  reorder entry alphabetically
 2016-05-06 09:41:44 +02:00
Anatol Belski 627b5aae3f update NEWS 2016-05-06 09:41:21 +02:00
Anatol Belski d76638b491 reorder entry alphabetically 2016-05-06 09:39:02 +02:00
Anatol Belski 80f91fd9d5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Re-fix #72165
  Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new"
 2016-05-06 09:33:22 +02:00
Anatol Belski 5afba67bfe Re-fix #72165 
Reverted previous wrong patch, throw warning for numeric keys.
Numeric field names are not supported, see "distinguished name"
section here https://www.openssl.org/docs/manmaster/apps/req.html
 2016-05-06 09:30:41 +02:00
Anatol Belski dd5479ea4c Revert "Fixed bug #72165 Null pointer dereference - openssl_csr_new" 
This reverts commit 7277c85765.
 2016-05-06 09:19:04 +02:00
Anatol Belski 20ae634bf0 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72165 Null pointer dereference - openssl_csr_new
 2016-05-06 09:02:14 +02:00
Anatol Belski 7277c85765 Fixed bug #72165 Null pointer dereference - openssl_csr_new 2016-05-06 09:01:27 +02:00
Xinchen Hui 4cd9cf8257 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test
  Revert "Fix bug #72162 (again)"
 2016-05-06 10:53:25 +08:00
Xinchen Hui 080f6b10ec Fixed test 2016-05-06 10:51:38 +08:00
Xinchen Hui 441d1b8ef0 Revert "Fix bug #72162 (again)" 
The problem is because we release p->value too early

and later you try to convert an object to string, which is a fatal error

then leave p->value double free, change to expect long is a BC break

This reverts commit 8e5b381004.
 2016-05-06 10:45:44 +08:00
Bob Weinand bac6fdb0c5 Refactor zval cleanup into single function 
Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor()
 2016-05-05 23:31:57 +02:00
Nikita Popov 59f35c0ca9 Merge branch 'PHP-7.0' 
Conflicts:
	Zend/zend_builtin_functions.c
 2016-05-05 17:31:25 +02:00
Nikita Popov 8e5b381004 Fix bug #72162 (again) 
Not sure what the previous fix was supposed to do. The issue was
that error_reporting() simply assumes that the value must either
be an integer or a string.

Fixed by using zpp properly.
 2016-05-05 17:28:52 +02:00
Dmitry Stogov 26adba38bc Micro-optimization 2016-05-05 16:19:59 +03:00
Dmitry Stogov 6d52492906 Update comments consistently (#var0 -> #v) 2016-05-05 14:41:34 +03:00