clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 22:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
95,988 Commits 494 Branches 1,367 Tags 790 MiB
0cdbabe558
Commit Graph

95988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
515a61069a Added test 2016-05-11 12:55:33 +03:00
Xinchen Hui
904ea128ee Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed Bug #72193 (dns_get_record returns array containing elements of type 'unknown')
 2016-05-11 17:32:06 +08:00
Xinchen Hui
df404e2e0e Fixed Bug #72193 (dns_get_record returns array containing elements of type 'unknown') 2016-05-11 17:31:46 +08:00
Xinchen Hui
233562c2da Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound)
 2016-05-11 11:12:46 +08:00
Xinchen Hui
66ad4fc393 Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound) 2016-05-11 11:12:27 +08:00
Derick Rethans
1c49a9fa71 Merge branch 'PHP-7.0' 2016-05-10 15:40:09 -04:00
Derick Rethans
c35bd4861d Allow for special case for the opcache zend extension 2016-05-10 15:40:03 -04:00
Anatol Belski
208c28f152 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix handle leak
 2016-05-10 20:03:27 +02:00
Anatol Belski
0718aa5833 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix handle leak
 2016-05-10 20:02:17 +02:00
Anatol Belski
6b63d80a7a fix handle leak 2016-05-10 19:59:48 +02:00
Dmitry Stogov
13ea086945 Merge branch 'PHP-7.0' 
* PHP-7.0:
  The "flock" structure has to be writable on AIX.
 2016-05-10 17:53:43 +03:00
Dmitry Stogov
f7372f648f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  The "flock" structure has to be writable on AIX.
 2016-05-10 17:53:33 +03:00
Dmitry Stogov
90f43caf5b The "flock" structure has to be writable on AIX. 2016-05-10 17:50:14 +03:00
Anatol Belski
fd0731f09c Merge branch 'PHP-7.0' 
* PHP-7.0:
  prepare next 7.0.8
 2016-05-10 13:10:35 +02:00
Anatol Belski
09dae4dc85 prepare next 7.0.8 2016-05-10 13:06:55 +02:00
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