php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 19:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,837 Commits 547 Branches 1,483 Tags
0f88a49fd511e6c68d004cc4aecd7aae76dbd63f
Commit Graph

4452 Commits

Author SHA1 Message Date
Nikita Popov
0b69ce72b8 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 18:14:10 +02:00
Nikita Popov
42549b7844 Add missing null termination 2017-09-05 18:13:50 +02:00
Nikita Popov
e866e05b0d Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 16:24:21 +02:00
Bouke van der Bijl
cd9d90f4d4 Fixed bug #70470 2017-09-05 16:23:32 +02:00
Nikita Popov
9871555090 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-02 18:16:56 +02:00
George Wang
e78712791d take care of compile warnings. 2017-08-02 11:59:41 -04:00
Joe Watkins
b44484b912 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update copyright year to 2017
 2017-07-24 17:24:10 +01:00
Peter Kokot
924ff6164e Update copyright year to 2017 2017-07-24 17:23:57 +01:00
Joe Watkins
2e82ed9b73 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
 2017-07-17 06:51:47 +01:00
Peter Kokot
0db20a7cb1 Fixed bug 74913 redirecting incorrect include <sys/poll.h> 2017-07-17 06:50:59 +01:00
George Wang
4e4f2f9f89 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-27 23:16:25 -04:00
George Wang
751d19f698 [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), but not applies. 
[BUGFIX] when lsapi used the php_value has higher priority then ini_set when called from the script by itself .
 2017-06-27 23:14:36 -04:00
Xinchen Hui
caf35c5cf5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:35 +08:00
Manuel Mausz
91f129ebf7 Add simple cli test for PATH/HOST ini sections 2017-06-09 23:28:19 +02:00
Xinchen Hui
78b10dd9d6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added cleanup
 2017-05-17 23:25:17 +08:00
Xinchen Hui
0954ea8d6d Added cleanup 2017-05-17 23:24:58 +08:00
Xinchen Hui
f38487a0e0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added test for bug #74600
 2017-05-17 23:21:38 +08:00
Xinchen Hui
ef09bc0645 Added test for bug #74600 2017-05-17 23:21:18 +08:00
Xinchen Hui
15dbe775d1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix typo: exectute => execute
 2017-05-09 11:01:52 +08:00
Andrew Marcinkevičius
abad134681 Fix typo: exectute => execute 2017-05-08 13:59:05 +03:00
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
e642375764 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Fixed condition check
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:07:24 +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