1
0
mirror of https://github.com/php/php-src.git synced 2026-04-04 14:42:49 +02:00
Commit Graph

74197 Commits

Author SHA1 Message Date
Xinchen Hui
2bcbe8fab9 Merge branch 'PHP-5.5' 2013-04-20 15:24:48 +08:00
Xinchen Hui
63d3ef4df0 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-20 15:24:18 +08:00
Xinchen Hui
6ed16753c1 Fixed bug #64677 (execution operator `` stealing surrounding arguments) 2013-04-20 15:23:49 +08:00
Dmitry Stogov
1fe5ee4d6a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed 5.2 ZTS build
2013-04-19 21:44:00 +04:00
Dmitry Stogov
c7cf9b68b6 Fixed 5.2 ZTS build 2013-04-19 21:37:24 +04:00
Andrey Hristov
6ce68583be Merge branch 'PHP-5.5' 2013-04-19 16:47:47 +02:00
Andrey Hristov
7b7424c34c Merge branch 'PHP-5.4' into PHP-5.5 2013-04-19 16:29:53 +02:00
Andrey Hristov
39cc08c7e9 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-19 15:55:46 +02:00
Andrey Hristov
0802961bd1 lower the limit, should fit in a byte 2013-04-19 15:54:35 +02:00
Dmitry Stogov
fc2f2f7813 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix other typos & add test script
  Fix typo
  - Fixed ZTS build
2013-04-19 10:48:46 +04:00
Dmitry Stogov
1074bbd5a3 Fixed ZTS build 2013-04-19 10:48:21 +04:00
Dmitry Stogov
0040aa29b9 Fixed ZTS build 2013-04-19 10:43:00 +04:00
Xinchen Hui
676e737f5b Fix other typos & add test script 2013-04-19 11:21:44 +08:00
Xinchen Hui
580d6fe94d Fix typo 2013-04-19 10:55:11 +08:00
Felipe Pena
1192cfa58c - Fixed ZTS build 2013-04-18 19:27:02 -03:00
Dmitry Stogov
3735d96ce0 Disable FCALL optimization pass for PHP older than 5.4
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
2013-04-18 22:26:37 +04:00
Dmitry Stogov
60a59d27b4 Disable FCALL optimization pass for PHP older than 5.4 2013-04-18 22:22:48 +04:00
Dmitry Stogov
edfeab8bf2 Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL. 2013-04-18 22:12:31 +04:00
Dmitry Stogov
7deb3d41eb Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5:
  Fixed compiler warning "cast from pointer to integer of different size"
2013-04-18 14:19:17 +04:00
Xinchen Hui
0acdeec743 Merge branch 'PHP-5.5' 2013-04-18 17:33:21 +08:00
Xinchen Hui
0704e4badb Fixed compiler warning "cast from pointer to integer of different size" 2013-04-18 17:32:46 +08:00
Dmitry Stogov
5cdc71ae07 Optimizer may hide some repeating error messages 2013-04-18 11:54:27 +04:00
Dmitry Stogov
26c761915b Optimizer may hide some repeating error messages 2013-04-18 11:53:44 +04:00
Dmitry Stogov
745531b120 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:50:40 +04:00
Dmitry Stogov
2bfb523f45 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:48:16 +04:00
Dmitry Stogov
36d343c0c4 Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5:
  Initialize literals hash_value and cache_slot
  Added curl config test for windows
  updated lib versions
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
2013-04-17 21:32:08 +04:00
Dmitry Stogov
bc959fbaff Merge branch 'PHP-5.5'
* PHP-5.5:
  Initialize literals hash_value and cache_slot

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
2013-04-17 21:27:19 +04:00
Dmitry Stogov
5a897009a8 Initialize literals hash_value and cache_slot 2013-04-17 21:19:56 +04:00
Anatol Belski
cd3dc3308b Merge branch 'PHP-5.5'
* PHP-5.5:
  Added curl config test for windows
2013-04-17 14:26:26 +02:00
Anatol Belski
2d9cbf720d Added curl config test for windows 2013-04-17 14:25:45 +02:00
Anatol Belski
08fa45a372 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated lib versions
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10
  allow lcov 1.10
2013-04-17 13:21:20 +02:00
Anatol Belski
c76cdb8067 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10
2013-04-17 13:20:46 +02:00
Anatol Belski
ca425a67c4 updated lib versions 2013-04-17 13:20:23 +02:00
Anatol Belski
ecf76e2da8 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated lib versions
  allow lcov 1.10
2013-04-17 13:18:00 +02:00
Anatol Belski
fb955a613c updated lib versions 2013-04-17 13:17:32 +02:00
Anatol Belski
4fbe1173eb fixed EOL 2013-04-17 13:15:08 +02:00
Anatol Belski
323fdb9879 updated lib versions 2013-04-17 13:12:18 +02:00
Dmitry Stogov
e16f24327d Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5:
  allow lcov 1.10
  Fixed bug (Wrong ce cached)
  apply change from opcache readme to php.ini
  lucky that the name is not used, fix name of encoder
2013-04-15 12:09:02 +04:00
Nuno Lopes
a9271a8b0d allow lcov 1.10 2013-04-13 16:57:25 -04:00
Nuno Lopes
e694d40963 allow lcov 1.10 2013-04-13 16:56:30 -04:00
Nuno Lopes
adc17bff57 allow lcov 1.10 2013-04-13 16:53:39 -04:00
Nuno Lopes
dacbf70f92 allow lcov 1.10 2013-04-13 16:51:58 -04:00
Dmitry Stogov
a0e3ca1c98 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug (Wrong ce cached)
  apply change from opcache readme to php.ini
  lucky that the name is not used, fix name of encoder
2013-04-11 15:32:54 +04:00
Dmitry Stogov
a78c7a4206 Added script level constant replacement 2013-04-11 15:31:35 +04:00
Dmitry Stogov
276847caba Added script level constant replacement 2013-04-11 15:18:35 +04:00
Xinchen Hui
bcb223a626 Merge branch 'PHP-5.5' 2013-04-11 14:29:51 +08:00
Xinchen Hui
a5cfe57e08 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-11 14:29:09 +08:00
Xinchen Hui
ba292b037f Fixed bug (Wrong ce cached) 2013-04-11 14:28:42 +08:00
Pierre Joye
e2f3c7f2bc Merge branch 'PHP-5.5'
* PHP-5.5:
  lucky that the name is not used, fix name of encoder
2013-04-11 07:08:58 +02:00
Pierre Joye
e71b794569 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00