clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,953 Commits 494 Branches 1,367 Tags 801 MiB
aee2985f35
Commit Graph

88953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Stogov
fb4b706984 Enable GCC global register variables if available 2015-03-17 13:51:02 +03:00
Julien Pauli
92bf4566ea Updated NEWS 2015-03-17 11:07:15 +01:00
julien.pons
90114a3e93 Add wifcontinued and wcontinued for pcntl 2015-03-17 10:59:58 +01:00
Anatol Belski
56b0ff0e5d Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
 2015-03-17 09:22:11 +01:00
Anatol Belski
f040b48358 updated NEWS 2015-03-17 09:21:38 +01:00
Anatol Belski
a6a58dddc3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
 2015-03-17 09:20:54 +01:00
Anatol Belski
0f18a15e89 Fixed bug #65406 Enchant broker plugins are in the wrong place in windows 2015-03-17 09:20:16 +01:00
Anatol Belski
b9bc84e29e use default test timeout 2015-03-16 23:07:33 +01:00
Anatol Belski
fd51bd4a9e test fixes + added skipif for slow tests 2015-03-16 13:55:40 -07:00
Anatol Belski
042dd8602e use busy sleep instead of sleep() for timeout tests 2015-03-16 13:21:33 -07:00
Anatol Belski
59a2a900a5 remove ext/mysql enablement from travis build 2015-03-16 20:05:40 +01:00
Anatol Belski
cab21b9347 test timeout with shutdown function, variation 2015-03-16 19:37:07 +01:00
Anatol Belski
1d6f94eeef test timeout with shutdown function 2015-03-16 19:35:36 +01:00
Anatol Belski
33d832bd45 test timeout with foreach loop 2015-03-16 19:30:04 +01:00
Anatol Belski
b05635ade9 test timeout with for loop 2015-03-16 19:28:01 +01:00
Anatol Belski
eab7da4bc9 test timeout with exception variation 2015-03-16 19:26:17 +01:00
Anatol Belski
1c0fce922e test timeout with exception 2015-03-16 19:21:58 +01:00
Anatol Belski
8f1fa842cd fix timeout with cal_user_func 2015-03-16 19:16:09 +01:00
Anatol Belski
7a7d8b9f9d test timeout within eval() 2015-03-16 19:12:55 +01:00
Anatol Belski
82d3a13983 test timeout with array_walk 2015-03-16 19:05:21 +01:00
Anatol Belski
f591c0dff8 test timeout within function 2015-03-16 19:01:23 +01:00
Anatol Belski
394bd2ab41 test timeout within while loop 2015-03-16 18:58:32 +01:00
Dmitry Stogov
5c68836b0b improved timeout handling on windows 2015-03-16 17:49:43 +01:00
Julien Pauli
4d3a3811a9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix flaws in session module

Conflicts:
	ext/session/session.c
 2015-03-16 16:11:02 +01:00
Julien Pauli
2a50877428 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix flaws in session module
 2015-03-16 16:01:12 +01:00
Julien Pauli
4dba99c226 Fix flaws in session module 2015-03-16 16:00:46 +01:00