php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-16 04:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,199 Commits 547 Branches 1,483 Tags
3ffe2cd251731d68493becf8ebbe6312ee86bb8d
Commit Graph

4431 Commits

Author SHA1 Message Date
Joe Watkins
68b312db7d Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fixed condition check
  Fixed condition check
  another place
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:07:52 +01:00
Joe Watkins
c961beb5de Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74400 (phpdbg comparing socket function to int)
 2017-04-10 08:06:11 +01:00
Joe Watkins
60b68f19f0 Fixed bug #74400 (phpdbg comparing socket function to int) 2017-04-10 08:05:31 +01:00
Xinchen Hui
9398f15efd Fixed condition check 2017-04-10 14:48:31 +08:00
Xinchen Hui
65d77812fc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed condition check
 2017-04-10 14:47:42 +08:00
Xinchen Hui
4bebcb84ad Fixed condition check 2017-04-10 14:47:24 +08:00
Anatol Belski
2ec54af8df fix buffer overflow 2017-04-03 14:22:23 +02:00
Anatol Belski
279d1efbdb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  Revert "Fixed bug #61471"
 2017-03-28 13:13:24 +02:00
Anatol Belski
ef8632c9dc Revert "Fixed bug #61471" 
This reverts commit 80c8d84af3.
 2017-03-28 13:06:38 +02:00
Joe Watkins
c564924d31 Revert "fix crash in phpdbg shutdown process when opcache is loaded" 
This reverts commit 008fb28eaf.
 2017-02-27 19:21:10 +00:00
Joe Watkins
7aa59a4440 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix crash in phpdbg shutdown process when opcache is loaded
 2017-02-27 17:55:14 +00:00
Joe Watkins
008fb28eaf fix crash in phpdbg shutdown process when opcache is loaded 2017-02-27 17:54:48 +00:00
Joe Watkins
46d0933668 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:48:48 +00:00
Coenraad Loubser
9eaf551c86 pull-request/2393: 
stop make install from clobbering default dot d configuration
 2017-02-22 06:47:23 +00:00
Nikita Popov
6d5ea20e0b Merge branch 'PHP-7.0' into PHP-7.1 2017-02-12 00:06:35 +01:00
Denis Yeldandi
9814be4bc2 Fixed bug #69860 2017-02-12 00:06:04 +01:00
Nikita Popov
f352c50026 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-08 01:10:48 +01:00
Zheng SHAO
80c8d84af3 Fixed bug #61471 2017-02-08 01:10:13 +01:00
Jakub Zelenka
1dab39b9aa Merge branch 'PHP-7.0' into PHP-7.1 2017-01-29 20:44:51 +00:00
Jakub Zelenka
df16579642 Try fpm path for testing in sbin as it is default target 2017-01-29 20:43:58 +00:00
Bob Weinand
d0272ef1ef Merge branch 'PHP-7.0' into PHP-7.1 2017-01-25 13:01:10 +01:00
Bob Weinand
c44efbbbb1 Fix copying too much leading to potential segfault 2017-01-25 13:00:48 +01:00
Joe Watkins
9aad38038e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix Bug #69865 php-fpm does not close stderr when using syslog
 2017-01-23 16:56:08 +00:00
Michael Wallner
80a851b4dd Fix Bug #69865 php-fpm does not close stderr when using syslog 2017-01-23 16:55:15 +00:00
Antony Dovgal
9d7054693e use correct shift and fix slowlog bt in 7.1 2017-01-23 14:50:09 +03:00
Joe Watkins
bbe21ccf38 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Remove remnants of TSMRLS_* macro calls
 2017-01-18 17:46:11 +00:00
Thomas Punt
fb8486f3bd Remove remnants of TSMRLS_* macro calls 2017-01-18 17:42:45 +00:00
Joe Watkins
19363de12f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:17 +00:00
Mitch Hagstrand
fd92b91188 Increase wait time for tests involving sockets to improve Travis relability 
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
 2017-01-13 06:45:04 +00:00
Anatol Belski
aacba43056 Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo() 2017-01-12 22:06:03 +01:00
Anatol Belski
e65760f878 Fixed bug #73904 php-cgi fails to load -c specified php.ini file 2017-01-12 17:25:26 +01:00
Joe Watkins
aadc84f6f7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #73902 mention router support in usage output for php-cli
 2017-01-10 06:20:56 +00:00
Joe Watkins
125ee6a68e Fixed #73902 mention router support in usage output for php-cli 2017-01-10 06:19:34 +00:00
Joe Watkins
c846daef28 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use proper file extension for the README
 2017-01-08 21:05:24 +00:00
Markus Staab
5b5483dc8e Use proper file extension for the README 2017-01-08 21:05:06 +00:00
Joe Watkins
230b387e8a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix 404 links in Litespeed README - Bug 73890
 2017-01-08 20:28:05 +00:00
Peter Kokot
7f1247004e Fix 404 links in Litespeed README - Bug 73890 2017-01-08 20:27:48 +00:00
Joe Watkins
8961c78524 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve FPM tests (mostly for systemd build)
 2017-01-08 19:03:10 +00:00
Remi Collet
eb02876e74 improve FPM tests (mostly for systemd build) 2017-01-08 19:02:50 +00:00
Nikita Popov
bb2ab75555 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-07 22:54:16 +01:00
Nikita Popov
a46bbdda2e Fixed bug #67583 
As fcgi_request is an opaque struct as of PHP 7, expose a new API
function fcgi_end() which does fcgi_flush() with end=1 and checks/
sets the ->ended flag.
 2017-01-07 22:53:28 +01:00
Joe Watkins
f60ebd13b3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixes for session and fpm tests in PHP7.0 branch
 2017-01-07 07:10:46 +00:00
Mitch Hagstrand
3401f553b9 Fixes for session and fpm tests in PHP7.0 branch 
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Disabled session GC in session_set_save_handler_basic.phpt
3. Fixed GC in save_handler.inc to delete files based on age
 2017-01-06 19:55:57 -08:00
Joe Watkins
de3649e2a3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix inappropriate warning in FPM log
 2017-01-06 05:55:14 +00:00
Joe Watkins
6a03b43e5f Merge branch 'pull-request/1311' into PHP-7.0 
* pull-request/1311:
  fix inappropriate warning in FPM log
 2017-01-06 05:54:42 +00:00
Anatol Belski
34c1040e22 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
 2017-01-05 14:02:43 +01:00
Anatol Belski
57736cc937 Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0" 
This reverts commit a8931df672, reversing
changes made to f2f35a2b27.
 2017-01-05 13:59:01 +01:00
Joe Watkins
c370024c2c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix php-fpm.service.in
 2017-01-05 06:54:37 +00:00
Joe Watkins
b037c43497 Merge branch 'pull-request/1256' into PHP-7.0 
* pull-request/1256:
  Fix php-fpm.service.in
 2017-01-05 06:54:19 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00