php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,197 Commits 547 Branches 1,481 Tags
2bcbe8fab9873ffc8aabf210af5382634cc7fb19
Commit Graph

31625 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Pierre Joye
4475dbf11d Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-11 06:58:04 +02:00
Pierre Joye
684f4d5272 lucky that the name is not used, fix name of encoder 2013-04-11 06:42:38 +02:00
Anatol Belski
622af62502 Merge branch 'master' of git.php.net:php-src 2013-04-10 20:52:29 +02:00
Anatol Belski
7133eee5f2 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-10 20:51:58 +02:00
Anatol Belski
b6d54faa92 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-10 20:51:32 +02:00
Anatol Belski
56b028e590 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2013-04-10 20:50:57 +02:00
Anatol Belski
9386ba9e97 Merge branch 'PHP-5.5' 
* PHP-5.5:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
 2013-04-10 20:47:55 +02:00
Anatol Belski
0655ab7c26 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
 2013-04-10 20:45:28 +02:00
Anatol Belski
ceb5b684e0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
 2013-04-10 20:40:28 +02:00
Anatol Belski
968ae4a56a Fixed bug #64342 ZipArchive::addFile() has to check for file existence 2013-04-10 20:39:17 +02:00
Pierre Joye
6ea7e6da8b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-10 20:15:03 +02:00
Pierre Joye
ea14901ca4 Merge branch 'master' of git.php.net:php-src 2013-04-10 20:14:46 +02:00
Pierre Joye
ca1962949e Merge branch 'PHP-5.5' 
* PHP-5.5:
  add external 2.1 detection and fix gd_compat for 2.1+
 2013-04-10 20:14:00 +02:00
Pierre Joye
87f5d9aa1b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add external 2.1 detection and fix gd_compat for 2.1+
 2013-04-10 20:13:46 +02:00
Pierre Joye
c480bf3fb2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  add external 2.1 detection and fix gd_compat for 2.1+
 2013-04-10 20:13:18 +02:00
Pierre Joye
224a67fb9f add external 2.1 detection and fix gd_compat for 2.1+ 2013-04-10 20:12:25 +02:00
Dmitry Stogov
fd15a71184 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Allow wilcards in opcache.blacklist_filename
 2013-04-10 21:42:50 +04:00
Dmitry Stogov
af967de2af Allow wilcards in opcache.blacklist_filename 2013-04-10 21:41:30 +04:00
Dmitry Stogov
28a0c38ee4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed support for PHP-5.3
 2013-04-10 21:27:54 +04:00
Dmitry Stogov
e27039630a Fixed support for PHP-5.3 2013-04-10 21:27:06 +04:00
Dmitry Stogov
5868b93c49 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added missing ARG_INFO
 2013-04-10 16:47:13 +04:00
Dmitry Stogov
2b3a4afcbf Added missing ARG_INFO 2013-04-10 16:45:59 +04:00