clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,482 Commits 494 Branches 1,367 Tags 813 MiB
bccd4184a5
Commit Graph

35156 Commits

Author SHA1 Message Date
Dmitry Stogov
bccd4184a5 Fixed error messages 2014-06-12 00:33:43 +04:00
Dmitry Stogov
14e6ee7f42 Use absolute addresses as branch targets for NEW, FE_RESET and FE_FETCH 2014-06-11 11:39:42 +04:00
Dmitry Stogov
15ba03fc80 Avoid repeatable zend_is_autogolobal() calls 2014-06-10 00:16:18 +04:00
Dmitry Stogov
7c045c61f0 Optimized for fast path 2014-06-10 00:15:44 +04:00
Dmitry Stogov
9a9bb8877e Improved ZTS support 2014-06-09 21:29:20 +04:00
Dmitry Stogov
dbaef7c038 Avoid unnecessary memory allocation/deallocations and pcre calls 2014-06-09 15:42:32 +04:00
Matteo Beccati
8cfdf20ccf Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191 
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
 2014-06-09 07:08:04 +02:00
Dmitry Stogov
dd0e96cca3 Bundle pcre-8.35 with sljit support 2014-06-06 18:46:19 +04:00
Dmitry Stogov
1593d942e7 Fixed compilation warnings 2014-06-05 20:58:21 +04:00
Dmitry Stogov
717839735f Merge branch 'master' into phpng 
* master: (29 commits)
  drop exec perm on doc files
  fix test for 5.4/5.5
  restore correct behavior of DateTime
  fix test use invalid code
  add test for previous fix
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
  update news
  update NEWS
  Fix tests
  Fix possible segfault depending on memory location...
  Fixed startup segfault in non-debug builds Fixes issue #87
  PHP 5.4/5.5 compability in phpdbg_watch.c
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  Update NEWS
  Fixed startup segfault in non-debug builds Fixes issue #87
  ...
 2014-06-05 20:54:50 +04:00
Remi Collet
f11f7f5601 restore correct behavior of DateTime 2014-06-05 14:04:44 +02:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Remi Collet
f1ef7018f0 fix test use invalid code 2014-06-05 14:01:20 +02:00
Remi Collet
aafbf93841 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add test for previous fix
 2014-06-05 14:00:40 +02:00
Remi Collet
218df7e058 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add test for previous fix
 2014-06-05 14:00:29 +02:00
Remi Collet
ab848ea400 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add test for previous fix
 2014-06-05 14:00:15 +02:00
Remi Collet
15d8c80ead add test for previous fix 2014-06-05 14:00:00 +02:00
Remi Collet
2890284096 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:47:14 +02:00
Remi Collet
2b3f4cc29e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:46:41 +02:00
Remi Collet
9ea9064779 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:45:57 +02:00
Remi Collet
1fe9f1e4f5 Fix regression introduce in fix for bug #67118 
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6

This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
  which is check by DATE_CHECK_INITIALIZED by later method call

Will restore consistency with other date classes in master.
 2014-06-05 13:39:46 +02:00
Dmitry Stogov
6e7338700e Avoid useless merge 2014-06-04 02:11:26 +04:00
Anatol Belski
e2710310a0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed regression introduced by patch for bug #67072
 2014-06-03 20:51:18 +02:00
Anatol Belski
20568e5028 Fixed regression introduced by patch for bug #67072 
This applies to 5.4 and 5.5 only as a legacy fix.
 2014-06-03 20:43:58 +02:00
Anatol Belski
2cdcf3e877 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
 2014-06-03 11:38:19 +02:00
Anatol Belski
f3f22ff5c6 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files 2014-06-03 11:37:20 +02:00
Dmitry Stogov
3f6f0d5a70 Simplified and optimized ZEND_HANDLE_NUMERIC() 2014-06-03 13:10:42 +04:00
Remi Collet
7a00e8890b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:10:08 +02:00
Remi Collet
e61f7727d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:29 +02:00
Remi Collet
2d59b87527 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:04 +02:00
Remi Collet
4fcb9a9d1b Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check 
Upstream fix 6d209c1c48.patch
Only revelant part applied
 2014-06-03 11:05:00 +02:00
Dmitry Stogov
30c05577f7 Optimized conditions order 2014-06-03 03:54:03 +04:00
Dmitry Stogov
0427ae08fb cleanup 2014-06-03 00:36:31 +04:00
Xinchen Hui
717b5661e7 Fixed merge 2014-06-01 23:14:31 +08:00
Xinchen Hui
91b2ddc816 Merge branch 'master' into phpng 
Conflicts:
	ext/spl/spl_array.c
	ext/spl/spl_directory.c
	ext/standard/formatted_print.c
 2014-06-01 22:43:06 +08:00
Xinchen Hui
d196ac6a48 Merge branch 'PHP-5.6' 2014-06-01 19:42:53 +08:00
Xinchen Hui
c4e7c7d50e Merge branch 'PHP-5.5' into PHP-5.6 2014-06-01 19:42:20 +08:00
Xinchen Hui
9bb5867fad Merge branch 'PHP-5.4' into PHP-5.5 2014-06-01 19:41:35 +08:00
Xinchen Hui
38be99b739 Fixed bug #67359 (Segfault in recursiveDirectoryIterator) 2014-06-01 19:41:01 +08:00
Dmitry Stogov
45d7ab1a4c Avoid in-place modification 2014-05-30 11:12:03 +04:00
Adam Harvey
f4a235c541 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:57:54 +00:00
Adam Harvey
b8042acdde Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:56:32 +00:00
Adam Harvey
43e3a83d51 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
 2014-05-29 17:53:28 +00:00
Adam Harvey
b5d9983ff4 Check for zero-length keys in spl_array_skip_protected and don't skip them. 
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
 2014-05-29 17:49:32 +00:00
Dmitry Stogov
b3b616cf7e Introduced immutable arrays. They don't need to be copyed and may be used directly from SHM. 2014-05-29 18:21:56 +04:00
Nikita Popov
bfff679d90 Fix length reset in JSON parser 2014-05-29 12:53:32 +02:00
Nikita Popov
ccd9dab4c6 Fix $http_response_header creation 2014-05-29 12:51:03 +02:00
Dmitry Stogov
8334f38615 Fixed conversion to phpng mistakes 2014-05-28 23:04:50 +04:00
Nikita Popov
9e2bc83fdb Use zend_long_to_str in wddx 2014-05-28 18:55:51 +02:00
Nikita Popov
3831b39302 Use zval_get_string in implode 
Also get rid of separate case for IS_OBJECT - this is already
handled by the default branch.
 2014-05-28 18:45:00 +02:00