php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
88,899 Commits 549 Branches 1,485 Tags
d22bfb8aa68fe61eae1c0e124bd3002c7d42e5c4
Commit Graph

88899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Ferrara d22bfb8aa6 Merge in master, fix merge conflicts and update patch to support exceptions everywhere 2015-03-18 10:50:11 -04:00
Xinchen Hui 5c6db3b0f2 Better make this be consistent with DO_ICALL/DO_CALL 
Revert "Use more specific op type"
This reverts commit 9b07ed6dcc.
 2015-03-18 22:09:57 +08:00
Anatol Belski e839ed8c99 strtod shouldn't recognize hex strings 2015-03-18 14:26:15 +01:00
Dmitry Stogov a01b5f2953 Enabled global register variables for PPC 2015-03-18 16:15:00 +03:00
Xinchen Hui 9b07ed6dcc Use more specific op type 2015-03-18 20:56:28 +08:00
Dmitry Stogov 4e11095438 Reimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved at compile-time. __CLASS__ retrived using separate ZEND_FETCH_CLASS_NAME opcode. 2015-03-18 15:33:56 +03:00
Dmitry Stogov 65b7f4860e Revert "Improved zend_get_special_constant" 
This reverts commit 624eb49e78.
 2015-03-18 15:25:27 +03:00
Julien Pauli a3b5061cb8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-03-18 11:35:04 +01:00
Julien Pauli c7dfd8a3a4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-03-18 11:34:56 +01:00
Julien Pauli 9744aded1a Updated NEWS 2015-03-18 11:34:45 +01:00
Julien Pauli 4794f6bcc4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-03-18 10:56:03 +01:00
Julien Pauli 6262db7341 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-03-18 10:55:49 +01:00
Julien Pauli 5e4dd962e2 Updated NEWS 2015-03-18 10:55:32 +01:00
Stanislav Malyshev ff1914f491 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.40 next
 2015-03-17 22:39:28 -07:00
Stanislav Malyshev 58efcc7dd8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.40 next
 2015-03-17 22:39:21 -07:00
Stanislav Malyshev de0cee2f39 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.40 next

Conflicts:
	configure.in
	main/php_version.h
 2015-03-17 22:39:10 -07:00
Stanislav Malyshev 4c3b73b6df 5.4.40 next 2015-03-17 22:37:16 -07:00
Stanislav Malyshev 1ecd82f588 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
  oops, no idea how this got in
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
  add NEWS
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path

Conflicts:
	ext/ereg/regex/regcomp.c
	ext/standard/basic_functions.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	win32/registry.c
 2015-03-17 22:04:39 -07:00
Stanislav Malyshev 225cb973e5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

Conflicts:
	ext/zip/lib/zip_dirent.c
 2015-03-17 22:03:24 -07:00
Stanislav Malyshev 210cfafc2b update NEWS 2015-03-17 22:00:53 -07:00
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 https://github.com/garyhouston/regex/commit/70bc2965604b6b8aaf260049e64c708dddf85334
 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