1
0
mirror of https://github.com/php/php-src.git synced 2026-04-03 06:02:23 +02:00
Commit Graph

31357 Commits

Author SHA1 Message Date
Anatol Belski
7daabc42a2 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:15:46 +01:00
Anatol Belski
0125ec77d2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:14:13 +01:00
Anatol Belski
06a526be3e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
Anatol Belski
bb935ff8dc Fixed bug #64452 Zip PHPTs crash intermittently 2013-03-20 09:10:10 +01:00
Anatol Belski
cfd096fd7c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported fix for bug #62852
2013-03-19 21:22:09 +01:00
Anatol Belski
8d199c7c4f Backported fix for bug #62852 2013-03-19 21:19:55 +01:00
Anatol Belski
5cea998c5d Merge branch 'PHP-5.5'
* PHP-5.5:
  fix C89 compat
2013-03-19 15:14:03 +01:00
Anatol Belski
b3d82845db fix C89 compat 2013-03-19 15:13:27 +01:00
David Soria Parra
7b876167cf Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:48:05 +01:00
Mark Baker
4257469079 Fix #48358 add() method for SplDoublyLinkedLis 2013-03-19 14:46:21 +01:00
Dmitry Stogov
48e82b2988 Merge branch 'PHP-5.5'
* PHP-5.5:
  strlen() returns size_t
2013-03-19 10:45:57 +04:00
Dmitry Stogov
f621f0b8e7 strlen() returns size_t 2013-03-19 10:45:38 +04:00
Dmitry Stogov
48632d0fc4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Renamed Zend Optimizer+ into Zend OPcache
2013-03-19 10:32:50 +04:00
Dmitry Stogov
a62ffb72f4 Renamed Zend Optimizer+ into Zend OPcache 2013-03-19 10:32:24 +04:00
Dmitry Stogov
d5174afb89 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add stats to phpinfo
2013-03-19 10:19:01 +04:00
Dmitry Stogov
840c0d6091 Add stats to phpinfo 2013-03-19 10:17:44 +04:00
Dmitry Stogov
33ea10141d Merge branch 'PHP-5.5'
* PHP-5.5:
  Avoid trailing line break
2013-03-18 13:36:52 +04:00
Dmitry Stogov
5b0879e7c9 Avoid trailing line break 2013-03-18 13:36:31 +04:00
Dmitry Stogov
4e4bc3a21b Merge branch 'PHP-5.5'
* PHP-5.5:
  Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
  Add optional flag to opcache_get_status()
2013-03-18 13:16:32 +04:00
Dmitry Stogov
1fe43d0798 Add oom, wasted, hash and manual restart counters to help identify potential configuration problems 2013-03-18 13:13:35 +04:00
Dmitry Stogov
ccf7d7cc93 Add optional flag to opcache_get_status() 2013-03-18 11:23:26 +04:00
Boris Lytochkin
92198fa2a5 Merge branch 'PHP-5.5'
* PHP-5.5:
  merge with 5.4
  more test coverage: missing square bracket error message
  Fixed bug #61981
2013-03-17 20:53:19 +04:00
Boris Lytochkin
c5ba47ac59 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  more test coverage: missing square bracket error message
  Fixed bug #61981
2013-03-17 20:52:12 +04:00
Boris Lytochkin
85d9d85ce2 more test coverage: missing square bracket error message 2013-03-17 20:40:15 +04:00
Boris Lytochkin
719264d1af Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #61981
2013-03-17 20:18:17 +04:00
Boris Lytochkin
5d0826e9c3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #61981
2013-03-17 20:02:34 +04:00
Boris Lytochkin
b32405053f Fix bug #61981 2013-03-17 20:00:37 +04:00
Dmitry Stogov
ada89863c3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Load "black list" only if O+ is enabled
2013-03-17 12:17:39 +04:00
Dmitry Stogov
dcc927d3f2 Load "black list" only if O+ is enabled 2013-03-17 12:17:04 +04:00
Dmitry Stogov
513c6e7021 Merge branch 'PHP-5.5'
* PHP-5.5:
  Made opcache_get_status() return statistics during O+ restart
2013-03-17 11:57:08 +04:00
Dmitry Stogov
e66c8681c7 Made opcache_get_status() return statistics during O+ restart 2013-03-17 11:56:04 +04:00
Dmitry Stogov
8635900e8e Merge branch 'PHP-5.5'
* PHP-5.5:
  Enabled O+ build by default (it may be disabled before 5.0.0 release)
2013-03-17 10:59:23 +04:00
Dmitry Stogov
930b272d70 Enabled O+ build by default (it may be disabled before 5.0.0 release) 2013-03-17 10:58:30 +04:00
Dmitry Stogov
2db4e43436 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed files that are neccessary only for standalone pecl branch
  setting plausible default value for struct members
2013-03-17 10:42:41 +04:00
Dmitry Stogov
07b1eaa609 Removed files that are neccessary only for standalone pecl branch 2013-03-17 10:40:59 +04:00
Anatol Belski
fa3fc711d3 setting plausible default value for struct members
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:29:50 +01:00
Anatol Belski
23bf72f7b1 Merge branch 'master' of git.php.net:php-src 2013-03-16 18:27:21 +01:00
Etienne Kneuss
79d2657873 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove spurious int cast in between two longs
2013-03-16 18:20:24 +01:00
Etienne Kneuss
b46897941a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove spurious int cast in between two longs
2013-03-16 18:20:16 +01:00
Etienne Kneuss
5de1b08482 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove spurious int cast in between two longs
2013-03-16 18:20:06 +01:00
Etienne Kneuss
62364e6e01 Remove spurious int cast in between two longs 2013-03-16 18:19:14 +01:00
Anatol Belski
a8e72b61a6 Merge branch 'PHP-5.5'
* PHP-5.5:
  setting plausible default value for struct members
2013-03-16 18:09:30 +01:00
Anatol Belski
add5420d89 setting plausible default value for struct members
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:07:21 +01:00
Xinchen Hui
1ee20ab72a Merge branch 'PHP-5.5' 2013-03-16 23:16:56 +08:00
Xinchen Hui
c1cf7538f0 Fixed test after nick previous fix 2013-03-16 23:16:32 +08:00
Xinchen Hui
acd160530a Fix test after f8b91d9acf 2013-03-16 23:14:06 +08:00
Xinchen Hui
67618a8f88 Fixed test after nick previous fix 2013-03-16 22:58:47 +08:00
Dmitry Stogov
c4c61e395b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed memory leaks
2013-03-16 17:25:48 +04:00
Dmitry Stogov
e00b04a54f Fixed memory leaks 2013-03-16 17:24:54 +04:00
Dmitry Stogov
1b72240226 Merge branch 'PHP-5.5'
* PHP-5.5:
  Made test compatible with O+
2013-03-16 16:11:41 +04:00