archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
110059 commits 526 branches 1434 tags 873 MiB
Commit graph

350 commits

Author SHA1 Message Date
Nikita Popov
ce97ead399 Merge branch 'PHP-7.1' 2016-12-22 12:47:50 +01:00
Nikita Popov
175b9f67f6 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 12:47:29 +01:00
Sébastien Santoro
25c96f92f4 Fix IS_UNDEF comparisons in opcache 
These conditions were formerly `!q->pData` and `!p->pData`, and should
now be detected as undefined variables, using the special type IS_UNDEF.

Incidentally, this syntax raised a logical-not-parentheses compiler
warning, now gone.
 2016-12-22 12:46:14 +01:00
Anatol Belski
b204b3abd1 further normalizations, uint vs uint32_t 
fix merge mistake

yet one more replacement run
 2016-11-26 17:29:01 +01:00
Anatol Belski
d61db8d602 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  remove TSRMLS_*
 2016-11-22 00:32:42 +01:00
Anatol Belski
5e9b4c26a5 remove TSRMLS_* 2016-11-21 23:53:37 +01:00
Dmitry Stogov
429bfbd4c2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Accorate handling of too big inodes of chroot directories
 2016-11-17 01:14:47 +03:00
Dmitry Stogov
27542d9c9d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Accorate handling of too big inodes of chroot directories
 2016-11-17 01:14:23 +03:00
Dmitry Stogov
9849c97b1b Accorate handling of too big inodes of chroot directories 2016-11-17 01:08:42 +03:00
Mitch Hagstrand
1d8be7c044 Fix #73546: Logging for opcache has an empty file name 2016-11-16 21:30:40 +01:00
Dmitry Stogov
cd3527baee Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use full path
 2016-11-16 23:09:13 +03:00
Dmitry Stogov
8e350a627a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use full path
 2016-11-16 23:05:00 +03:00
Dmitry Stogov
8202b97077 Use full path 2016-11-16 23:01:40 +03:00
Dmitry Stogov
86460af56c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #69090 (check cached files permissions)
 2016-11-16 12:56:15 +03:00
Dmitry Stogov
a1a5b52f3b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #69090 (check cached files permissions)
 2016-11-16 12:49:50 +03:00
Dmitry Stogov
ecba563f2f Fixed bug #69090 (check cached files permissions) 2016-11-16 12:43:10 +03:00
Mitch Hagstrand
01a280a9c7 Fixed bug in zend_accel_error() and cleaned up kill_all_lockers() 
1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.

(cherry picked from commit bcee2fdbec)
 2016-10-14 01:56:01 +02:00
Mitch Hagstrand
bcee2fdbec Fixed bug in zend_accel_error() and cleaned up kill_all_lockers() 
1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.
 2016-10-12 23:03:55 +02:00
Keyur
0045d16863 Fixes #72590: Opcache restart with kill_all_lockers does not work 
ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.
 2016-09-05 16:59:28 +02:00
Xinchen Hui
f93061471b Make the expression more reasonble (by nikic) 2016-08-01 20:20:01 +08:00
Keyur
ffa863e800 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add to NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work
 2016-07-13 03:07:41 +00:00
Keyur
b512f4a956 Fixes #72590: Opcache restart with kill_all_lockers does not work 
ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.
 2016-07-13 03:01:26 +00:00
Dmitry Stogov
1433162083 Fixed compilation warnings 2016-06-21 20:12:29 +03:00
Dmitry Stogov
1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions. 
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
 2016-06-21 16:00:37 +03:00
Dmitry Stogov
8b823235d6 Removed wrong HANDLE_UNBLOCK_INTERRUPTIONS() 2016-06-20 18:50:24 +03:00
Dmitry Stogov
ad55348e66 Protect OPcache from termination during SHM modification. 2016-06-20 16:03:31 +03:00
Dmitry Stogov
0d77222473 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use PHP_VERSION as OPcahce version
 2016-05-17 17:17:09 +03:00
Dmitry Stogov
d41920c57d Use PHP_VERSION as OPcahce version 2016-05-17 17:16:10 +03:00
Dmitry Stogov
7b94b958cc Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
Dmitry Stogov
13ea086945 Merge branch 'PHP-7.0' 
* PHP-7.0:
  The "flock" structure has to be writable on AIX.
 2016-05-10 17:53:43 +03:00
Dmitry Stogov
f7372f648f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  The "flock" structure has to be writable on AIX.
 2016-05-10 17:53:33 +03:00
Dmitry Stogov
90f43caf5b The "flock" structure has to be writable on AIX. 2016-05-10 17:50:14 +03:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 
Also re bug #71575.
 2016-03-03 16:50:01 +01:00
Dmitry Stogov
2517835c64 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed possible crash at PCRE on MSHUTDOWN
 2016-02-24 23:47:05 +03:00
Dmitry Stogov
6842a3674d Fixed possible crash at PCRE on MSHUTDOWN 2016-02-24 23:46:11 +03:00
Dmitry Stogov
1a46917740 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed more synchronisation issues during SHM reload
 2016-02-24 21:16:35 +03:00
Dmitry Stogov
43366f8ba8 Fixed more synchronisation issues during SHM reload 2016-02-24 21:15:53 +03:00
Dmitry Stogov
bbea2ae048 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed process synchronisation problem, that may cause crashes after opcache restart
 2016-02-17 13:59:20 +03:00
Dmitry Stogov
d228752939 Fixed process synchronisation problem, that may cause crashes after opcache restart 2016-02-17 13:58:05 +03:00
Dmitry Stogov
d0b9ef27c5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed possible memory leak
 2016-02-15 16:40:21 +03:00
Dmitry Stogov
388ab976b5 Fixed possible memory leak 2016-02-15 16:40:05 +03:00
Xinchen Hui
be91106db7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update NEWS: "Fixed bug  #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
  Fix use-after-free of ZCG(cwd) in Zend Optimizer
 2016-02-15 10:33:18 +08:00
Xinchen Hui
8974e4c781 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update NEWS: "Fixed bug  #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
  Fix use-after-free of ZCG(cwd) in Zend Optimizer

Conflicts:
	ext/opcache/ZendAccelerator.c
 2016-02-15 10:32:50 +08:00
Yussuf Khalil
35f6f9b0db Fix use-after-free of ZCG(cwd) in Zend Optimizer 2016-02-10 10:33:57 +01:00
Xinchen Hui
563659822d Merge branch 'PHP-7.0' 2016-01-02 17:56:54 +08:00
Xinchen Hui
97a9470d97 bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
Xinchen Hui
3537e95dae bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00