archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
88979 commits 526 branches 1434 tags 877 MiB
Commit graph

88979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stanislav Malyshev
53eff4a369 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
 2015-03-17 22:00:29 -07:00
Stanislav Malyshev
ef8fc4b53d Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary 2015-03-17 21:59:56 -07:00
Xinchen Hui
205fe3ab89 Re-fix tests 2015-03-18 12:28:27 +08:00
Xinchen Hui
22b8b1d3f3 Revert "fix tests" 
This reverts commit 38e15d89d7.
 2015-03-18 12:27:13 +08:00
Xinchen Hui
e78278d878 Revert "Fixed tests" 
This reverts commit f57f1a903d.
 2015-03-18 12:26:56 +08:00
Xinchen Hui
624eb49e78 Improved zend_get_special_constant 2015-03-18 12:22:07 +08:00
Xinchen Hui
f57f1a903d Fixed tests 2015-03-18 12:19:56 +08:00
Stanislav Malyshev
d76b293ac7 forgot to commit this one 2015-03-17 17:16:27 -07:00
Stanislav Malyshev
63c9f830b1 add test for bug #68976 2015-03-17 17:16:15 -07:00
Stanislav Malyshev
749f82af02 oops, no idea how this got in 2015-03-17 17:13:50 -07:00
Stanislav Malyshev
14588c2499 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
 2015-03-17 17:10:14 -07:00
Stanislav Malyshev
bf2f03ddb3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:10:05 -07:00
Stanislav Malyshev
890b3987ab Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:09:47 -07:00
Stanislav Malyshev
c83dd84ad6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:08:13 -07:00
Stanislav Malyshev
fb04dcf6db Fix bug #69248 - heap overflow vulnerability in regcomp.c 
Merged from 70bc296560
 2015-03-17 17:04:57 -07:00
Stanislav Malyshev
8b14d3052f add test for bug #68976 2015-03-17 17:03:46 -07:00
Anatol Belski
8a8264a29a comb that header 2015-03-18 00:45:37 +01:00
Anatol Belski
956bab0566 fix endianness check plus better visual origin compat 2015-03-18 00:39:06 +01:00
Stanislav Malyshev
780222f97f Fixed bug #68976 - Use After Free Vulnerability in unserialize() 2015-03-17 16:31:52 -07:00
Stanislav Malyshev
38e15d89d7 fix tests 2015-03-17 16:30:57 -07:00
Stanislav Malyshev
6632684e03 Fix bug #69207 - move_uploaded_file allows nulls in path 2015-03-17 16:30:57 -07:00
Dmitry Stogov
fa1c05540c Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  this check isn't applicable anymore
 2015-03-18 02:17:12 +03:00
Dmitry Stogov
d6bb5c2cd4 GCC prior 4.8.0 may generates wrong code 2015-03-18 02:15:49 +03:00
Anatol Belski
b3788cd200 this check isn't applicable anymore 2015-03-18 00:14:20 +01:00
Nikita Popov
e39db5773d Fix phpdbg 2015-03-17 22:59:11 +01:00
Dmitry Stogov
87cec4ccc9 Fixed mess in names 2015-03-18 00:13:39 +03:00
Anatol Belski
0ac1075002 catching up with the git history 2015-03-17 22:11:31 +01:00
Anatol Belski
9903767734 fix undefined symbol 2015-03-17 22:11:30 +01:00
Anatol Belski
4ae9ecbb90 updated NEWS 2015-03-17 22:11:29 +01:00
Anatol Belski
87767d9ea1 adedd test for bug #68797 2015-03-17 22:11:28 +01:00
Anatol Belski
a160a9097a restore freeing stuff and some small improvements 2015-03-17 22:11:27 +01:00
Anatol Belski
5d4616e2b0 first shot on updating strtod stuff 2015-03-17 22:11:26 +01:00
Nikita Popov
5c230baf75 Implement Generator::getReturn() 
Conflicts:
	Zend/zend_vm_execute.h
 2015-03-17 21:51:53 +01:00
Nikita Popov
f1a6c06f14 Support ParseException for require etc 2015-03-17 21:35:42 +01:00
Stanislav Malyshev
dbd1d79b68 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add NEWS
 2015-03-17 13:24:45 -07:00
Stanislav Malyshev
6264f81a21 add NEWS 2015-03-17 13:24:17 -07:00
Stanislav Malyshev
33a5532b66 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
 2015-03-17 13:23:51 -07:00
Stanislav Malyshev
d5e523f52f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
 2015-03-17 13:22:12 -07:00
Stanislav Malyshev
646572d6d3 Fixed bug #68976 - Use After Free Vulnerability in unserialize() 2015-03-17 13:20:22 -07:00
Dmitry Stogov
55da1fb008 Fixed zend_hash_del() 2015-03-17 23:13:39 +03:00
Stanislav Malyshev
3d00867bba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
 2015-03-17 13:09:08 -07:00
Stanislav Malyshev
3dfccd7ba5 update news 2015-03-17 13:07:40 -07:00
Stanislav Malyshev
4a2e613730 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
 2015-03-17 13:06:17 -07:00
Stanislav Malyshev
bfb669891e Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options) 2015-03-17 13:05:43 -07:00
Stanislav Malyshev
3477568b4e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path
 2015-03-17 12:58:00 -07:00
Stanislav Malyshev
34418222d7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix tests
 2015-03-17 12:56:37 -07:00
Stanislav Malyshev
9ba4db5e5d fix tests 2015-03-17 12:55:35 -07:00
Stanislav Malyshev
e55e40ca66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69207 - move_uploaded_file allows nulls in path
 2015-03-17 12:48:37 -07:00
Stanislav Malyshev
1291d6bbee Fix bug #69207 - move_uploaded_file allows nulls in path 2015-03-17 12:47:58 -07:00
Dmitry Stogov
4d4a5336f1 Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations 2015-03-17 18:53:19 +03:00