mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 05:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
78,625 Commits 500 Branches 1,381 Tags 821 MiB
27d3b5b5b4
Commit Graph

225 Commits

Author SHA1 Message Date
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Dmitry Stogov
511a375e60 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Log information about cached scripts and keys
 2014-01-15 12:15:41 +04:00
Dmitry Stogov
299d893f0a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Log information about cached scripts and keys
 2014-01-15 12:15:25 +04:00
Dmitry Stogov
7359dd6df3 Log information about cached scripts and keys 2014-01-15 12:12:22 +04:00
Dmitry Stogov
61028ad45e Merge branch 'PHP-5.6' 
* PHP-5.6:
  We don't know PHP_5_6_X_API_NO yet
 2014-01-15 11:11:01 +04:00
Dmitry Stogov
77bc5b8bae We don't know PHP_5_6_X_API_NO yet 2014-01-15 11:09:38 +04:00
Xinchen Hui
aca07343ce Merge branch 'PHP-5.6' 2014-01-14 22:34:53 +08:00
Nikita Popov
a5ee337156 Fixed arguments unpacking segfault with opcache 2014-01-14 22:34:08 +08:00
Dmitry Stogov
5980e987d2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ZTS build
 2014-01-13 23:11:36 +04:00
Dmitry Stogov
029d019dac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ZTS build
 2014-01-13 23:10:35 +04:00
Dmitry Stogov
9c32d30020 Fixed ZTS build 2014-01-13 23:09:59 +04:00
Anatol Belski
de137e5a8d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked test for win32
 2014-01-13 17:13:11 +01:00
Anatol Belski
9b2dc009b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked test for win32
 2014-01-13 17:12:53 +01:00
Anatol Belski
8092de3ca3 forked test for win32 2014-01-13 17:12:14 +01:00
Dmitry Stogov
127eb33b84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
 2014-01-13 18:07:26 +04:00
Dmitry Stogov
7864fcaec9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
 2014-01-13 18:06:49 +04:00
Dmitry Stogov
ce2f024e9f Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0) 2014-01-13 18:05:21 +04:00
Dmitry Stogov
e141592da6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
 2014-01-13 16:16:57 +04:00
Dmitry Stogov
9b74dc4a07 Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls) 2014-01-13 16:16:23 +04:00
Dmitry Stogov
3458dac342 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
 2014-01-13 15:36:06 +04:00
Dmitry Stogov
ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +04:00
Dmitry Stogov
aab2e8eb7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
 2014-01-13 12:08:23 +04:00
Dmitry Stogov
d09d64c15c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
 2014-01-13 12:07:50 +04:00
Dmitry Stogov
fcd75690fe Fixed bug #66474 (Optimizer bug in constant string to boolean conversion) 2014-01-13 12:06:19 +04:00
Dmitry Stogov
83b00bbd08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:50:12 +04:00
Dmitry Stogov
f16a4bc203 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:49:54 +04:00
Dmitry Stogov
b5fbde9c5b Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry) 2014-01-09 13:48:08 +04:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
6b34343479 Merge branch 'PHP-5.6' 2013-12-30 11:07:42 +08:00
Xinchen Hui
5a756afcf1 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 11:07:37 +08:00
Xinchen Hui
ed5be4f7ad Fix test fail 2013-12-30 11:07:25 +08:00
Xinchen Hui
8b72df0608 Merge branch 'PHP-5.6' 2013-12-30 10:58:56 +08:00
Xinchen Hui
31d4d11432 Fix one more test in dos style eol 2013-12-30 10:58:40 +08:00
Xinchen Hui
f204df9a7f Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:58:23 +08:00
Xinchen Hui
6699b1f8ea Fix dos style eol in phpts 2013-12-30 10:58:01 +08:00
Xinchen Hui
408ae9a452 Merge branch 'PHP-5.6' 2013-12-30 10:52:21 +08:00
Xinchen Hui
a88543a106 Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 2013-12-30 10:51:47 +08:00
Xinchen Hui
04c8ce259f Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 
Use git blame -w to ingore the space changes
 2013-12-30 10:50:46 +08:00
Dmitry Stogov
65fd18fd88 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).

Conflicts:
	NEWS
	Zend/zend_extensions.h
	Zend/zend_modules.h
 2013-12-26 14:51:05 +04:00
Dmitry Stogov
03a37de9b3 Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings). 2013-12-26 14:47:13 +04:00
Dmitry Stogov
67eccf8617 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
 2013-12-23 16:54:54 +04:00
Dmitry Stogov
a00e7f22d2 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 16:53:34 +04:00
Dmitry Stogov
209ec406ca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
 2013-12-23 16:05:18 +04:00
Dmitry Stogov
ccb29a6e41 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 16:04:10 +04:00
Dmitry Stogov
62fa84a031 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added suggestion about opcache.revalidate_freq setting in development environment
 2013-12-23 13:11:22 +04:00
Dmitry Stogov
8650d2dda6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added suggestion about opcache.revalidate_freq setting in development environment
 2013-12-23 13:10:42 +04:00
Dmitry Stogov
f7b6db7555 Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 13:09:45 +04:00
Dmitry Stogov
5bc9e006e8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
	NEWS
 2013-12-23 12:52:27 +04:00