clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
106,936 Commits 491 Branches 1,363 Tags 846 MiB
d047137d7e
Commit Graph

4711 Commits

Author SHA1 Message Date
Dmitry Stogov
e70618aff6 Changed the way VM accesses constant operands in 64-bit builds. 2017-10-04 16:53:01 +03:00
Joe Watkins
17cf32ef45
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Typo in status.html
 2017-10-03 07:22:26 +01:00
Joe Watkins
6e39258302
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Typo in status.html
 2017-10-03 07:22:15 +01:00
Joe Watkins
d0cda9d0bd
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Typo in status.html
 2017-10-03 07:22:04 +01:00
Viktor Szépe
e995b7e475
Typo in status.html 
feet needs -> fit needs
 2017-10-03 07:21:53 +01:00
Joe Watkins
b44c1e4d3a
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:21:02 +01:00
Joe Watkins
b0950ff854
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:20:46 +01:00
Joe Watkins
1981c48e60
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:20:34 +01:00
Peter Kokot
29e673f8ed
Fix CGI m4 config message when CGI is disabled 2017-09-27 06:20:09 +01:00
Joe Watkins
e1d9f33cbc
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75248 and #75251
 2017-09-27 06:16:38 +01:00
Joe Watkins
474ee702ab
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75248 and #75251
 2017-09-27 06:16:13 +01:00
Joe Watkins
af71942da2
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75248 and #75251
 2017-09-27 06:15:47 +01:00
Peter Kokot
6d0391b1a4
Fix bug #75248 and #75251 2017-09-27 06:15:12 +01:00
Peter Kokot
2664638f7e Remove empty and done TODO file for CLI SAPI 
[ci skip]
 2017-09-24 18:44:46 +02:00
Remi Collet
c26d8ecf58 Merge branch 'PHP-7.2' 
* PHP-7.2:
  rename test
 2017-09-19 07:27:04 +02:00
Remi Collet
ee84f34344 rename test 2017-09-19 07:26:53 +02:00
Remi Collet
ce59da1997 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fixed Bug #75212 php_value acts like php_admin_value
 2017-09-18 18:09:40 +02:00
Remi Collet
cfc6c4d297 Fixed Bug #75212 php_value acts like php_admin_value 2017-09-18 18:08:51 +02:00
Anatol Belski
b81659d34f Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix the version check causing the test fail
 2017-09-18 12:07:12 +02:00
Anatol Belski
d8f1afb45e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix the version check causing the test fail
 2017-09-18 12:06:54 +02:00
Anatol Belski
5c59dd0047 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix the version check causing the test fail
 2017-09-18 12:06:23 +02:00
Anatol Belski
9641586efa Fix the version check causing the test fail 2017-09-18 12:04:31 +02:00
Remi Collet
1edc5aea33 Merge branch 'PHP-7.2' 
* PHP-7.2:
  fix tests for 32-bit
 2017-09-13 12:20:16 +02:00
Remi Collet
d99cd28925 fix tests for 32-bit 2017-09-13 12:20:05 +02:00
Anatol Belski
8e6619445f Fix test portability 2017-09-06 13:05:56 +02:00
Jansen Price
fafd67cb71
Add tests for sapi/cli option combinations 2017-09-06 09:54:00 +01:00
Nikita Popov
dfe030097d Merge branch 'PHP-7.2' 2017-09-05 18:14:21 +02:00
Nikita Popov
d78a7909c8 Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 18:14:16 +02:00
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
1ca43597df Merge branch 'PHP-7.2' 2017-09-05 16:25:06 +02:00
Nikita Popov
9fbd8620fb Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 16:24:40 +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
Kalle Sommer Nielsen
d3bc8beb4f Removed support for BeOS, development for BeOS was supported 17 years ago. 
This patch however does not drop support for the BeOS compatible variant, Haiku, see Github PR #2697 which is currently a WiP

I intentionally left out some fragments for BeOS in the build system for that seems to be bundles
 2017-08-29 22:03:56 +02:00
Fabien Potencier
cbda84f87c Fixed typo in FPM error message 2017-08-23 22:16:47 +02:00
Patrick Allaert
21cd57e5f2 EXPECT instead of EXPECTF 2017-08-16 17:05:47 +02:00
Patrick Allaert
b34702c774 Fixed: tests not written to pass on Windows 2017-08-16 17:05:47 +02:00
Patrick Allaert
5e83fc4e49 cli_get_process_title() may not be empty before set 2017-08-16 17:05:47 +02:00
Patrick Allaert
ce09f485ca Not skipping test on Windows and test against CLI instead 2017-08-16 17:05:47 +02:00
Patrick Allaert
9f16c22ead Added: tests for cli_get_process_title / cli_set_process_title 2017-08-16 17:05:47 +02:00
Anatol Belski
93c2c56a1b Rework automatic interactive cli activation 
There are still systems delivering buggy console info. If a file was
passed, obviously no interaction is meant.
 2017-08-03 11:23:50 +02:00
Nikita Popov
042ff13ca9 Merge branch 'PHP-7.1' into PHP-7.2 2017-08-02 18:18:23 +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
515b396889
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update copyright year to 2017
 2017-07-24 17:24:22 +01: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
Xinchen Hui
463413db53 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 12:02:54 +08:00
Joe Watkins
8c238c15bc
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
 2017-07-17 06:52:43 +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
Anatol Belski
8871d2d12e Fixed bug #74849 Process is started as interactive shell in PhpStorm 2017-07-03 21:59:31 +02:00
George Wang
79128b34ff Merge branch 'PHP-7.1' 2017-06-27 23:18:27 -04: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
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Richard Fussenegger
5fa1cd224b Fixed php_socket_t to int conversion 
This warning was about a possible loss of data due to the downcast of `php_socket_t` to `int`. The former maps to a platform specific type, hence, it might downcast from a 64 bit integer to a 32 bit intger.

Fixed possibly overflowing vars

Due to the change from `int` to `php_socket_t` some variables might overflow now. Changed all variables that might be affected.

Revert "Fixed possibly overflowing vars"

This reverts commit bf64fd5984.

Use aliased PHP socket type

Using the alias protects us from changes to the underlying type.

Removed ignored nfds argument

The `nfds` argument to the Win32 `select` function is always ignored, regardless of its actual value. Hence, we should not pass it in the first place. See https://msdn.microsoft.com/en-us/library/windows/desktop/ms740141(v=vs.85).aspx for reference.

Target value is not a pointer

Avoid overflow in loop
 2017-06-15 23:48:03 +02:00
Xinchen Hui
e33bc38e83 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:45 +08: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
Dmitry Stogov
fc1ae1d1d3 Exclude warm-up requests from callgrind profile. 2017-05-31 16:16:56 +03:00
Remi Collet
37a16a32c9 missing fix for another test 2017-05-29 12:07:13 +02:00
Anatol Belski
38ee9f7c0d extend condition 2017-05-27 13:30:55 +02:00
Anatol Belski
e5c273dc0e Turn interactive mode on, if cli binary is clicked in filemanager 2017-05-25 21:04:56 +02:00
Sara Golemon
d316ba2d65 Remove user=foo from FPM test config 
This setting has nothing to do with what's being tested,
and on any system without a "foo" user we'll get a spurious error.
 2017-05-24 15:07:24 -07:00
Sara Golemon
d8d1c78ed0 Skip FPM tests when running as root (unless requested) 
FPM must be configured as a user.
Normally it defaults to the current user,
but if that's root it'll fail to startup
unless the --run-as-root option is provided.

Extend that logic into the test runner so that
we don't fail for stupid reasons.

If you're running `make test` as root and you want
FPM tests to run anyway, set TEST_FPM_RUN_AS_ROOT=1
in your environment.
 2017-05-24 13:58:18 -07:00
Xinchen Hui
23ea38d8f7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added cleanup
 2017-05-17 23:25:34 +08: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
af0c443dde Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added test for bug #74600
 2017-05-17 23:21:42 +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
Dmitry Stogov
6f6ad066ea Merge branch 'hybrid-vm' 
* hybrid-vm:
  Cleanup
  Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
  Added missing ZEND_VM_HOT define
  Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
 2017-05-09 09:38:34 +03:00
Xinchen Hui
282d09a740 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix typo: exectute => execute
 2017-05-09 11:02:02 +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
Dmitry Stogov
27e01cd918 Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs. 2017-05-03 10:01:22 +03:00
Sammy Kaye Powers
fd0e71d001 Fix bug 60471 by correctly identifying unused speculative preconnections 
* Correctly identify unused speculative preconnections from browsers
  like Chrome and Firefox
* Add a new message to the debug level that is emitted when a TCP
  connection is closed without sending any request (a preconnection)
* Fix an issue where the existing debug messages were not being
  displayed even when debug mode was enabled
 2017-04-11 15:08:05 -07: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
e24dcf97f1
Merge branch 'master' of git.php.net:/php-src 
* 'master' 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:06:52 +01:00
Joe Watkins
5b013e7935
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74400 (phpdbg comparing socket function to int)
 2017-04-10 08:06:28 +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
696bd37e67 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c
 2017-04-10 14:49:13 +08: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
1459d5dc18 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix buffer overflow
 2017-04-03 14:25:37 +02:00
Anatol Belski
2ec54af8df fix buffer overflow 2017-04-03 14:22:23 +02:00
Thomas Punt
9f08aff3fd Remove superfluous allocation checks around ZMM-based functions 2017-04-02 00:58:19 +02:00
Sara Golemon
2b86a89193 Update tests and add NEWS entry for phpdbg opcode dump change 2017-03-29 12:54:52 -07:00
Sara Golemon
764b529efd Add extended_value to phpdbg opcode dump 2017-03-29 04:08:52 -07:00
Anatol Belski
0eb3c377d4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
  update NEWS
  Revert "Fixed bug #61471"
 2017-03-28 13:17:05 +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
Rowan Collins
1b565f1393 Change 'undefined constant' from E_NOTICE to E_WARNING and mention deprecation 
Implements RFC "Deprecate and Remove Bareword (Unquoted) Strings"
[https://wiki.php.net/rfc/deprecate-bareword-strings]
 2017-03-23 18:52:43 +01:00
Thomas Punt
932c4b35dc Remove more unnecessary checks on Zend's allocator functions 2017-03-16 12:23:55 +01:00
Nikita Popov
edcabf6d07 Drop unnecessary allocator return value checks 2017-03-13 22:07:15 +01:00
Sara Golemon
b63c45c69e Try fallback on IPv4 ANYADDR when IPv6 ANYADDR fails 
https://bugs.php.net/bug.php?id=74166
A host system with no/limited IPv6 support will fail at binding
the IPv6 ANYADDR address (::) as the address family is unsupported.

Deal with this by handling failure to implicitly bind to ::
as a soft failure, falling back to 0.0.0.0.

If binding to :: failed for some other reason (e.g. port in use)
then binding to 0.0.0.0 will likely fail as well, but we'll
get appropriate warnings for that.
 2017-03-08 11:02:54 -08:00
Anatol Belski
c698299550 Interned strings unification for TS/NTS 
Hereby, interned strings are supported in thread safe PHP. The patch
implements two types of interned strings

- interning per process, strings are not freed till process end
- interning per request, strings are freed at request end

There is no runtime interning.

With Opcache, all the permanent iterned strings are copied into SHM on
startup, additional copying into SHM might happen on demand.
 2017-03-04 10:39:13 +01: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
61ecad0f53
Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix crash in phpdbg shutdown process when opcache is loaded
 2017-02-27 17:55:31 +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
78ae563a48
Merge branch 'PHP-7.1' 
* PHP-7.1:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:49:22 +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
5383c9d9e5 Merge branch 'PHP-7.1' 2017-02-12 00:06:47 +01: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
4ec80663a6 Merge branch 'PHP-7.1' 2017-02-08 01:10:54 +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
10cd88588e Merge branch 'PHP-7.1' 2017-01-29 20:46:20 +00: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
d4dd540233 Merge branch 'PHP-7.1' 2017-01-25 13:01:48 +01: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
5c6bf3598a
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix Bug #69865 php-fpm does not close stderr when using syslog
 2017-01-23 16:57:01 +00: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
b5cfe11c5b use correct shift and fix slowlog bt in 7.1 2017-01-23 14:52:21 +03:00
Antony Dovgal
9d7054693e use correct shift and fix slowlog bt in 7.1 2017-01-23 14:50:09 +03:00
Joe Watkins
409467dc2f
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Remove remnants of TSMRLS_* macro calls
 2017-01-18 17:46:35 +00: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
Anatol Belski
ca4cfcc631 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.

(cherry picked from commit 57736cc937)

Something went wrong, so the revert didn't land in master.
Cherry-picking extra therefore.
 2017-01-15 17:18:00 +01:00
Joe Watkins
28391c30ca
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:31 +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
bdfe07c2e7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
 2017-01-12 22:08:20 +01: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
Anatol Belski
9f3b3a55fe Fixed bug #73904 php-cgi fails to load -c specified php.ini file 2017-01-12 14:15:21 +01:00
Joe Watkins
e54ee3eaa4
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed #73902 mention router support in usage output for php-cli
 2017-01-10 06:21:14 +00: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
64e80f5358
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Use proper file extension for the README
 2017-01-08 21:05:36 +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
14be227325
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix 404 links in Litespeed README - Bug 73890
 2017-01-08 20:28:22 +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
b2da9230f2
Merge branch 'PHP-7.1' 
* PHP-7.1:
  improve FPM tests (mostly for systemd build)
 2017-01-08 19:03:33 +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
53ff546054 Merge branch 'PHP-7.1' 2017-01-07 22:54:26 +01:00