diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-09-27 06:20:34 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-09-27 06:20:34 +0100 |
| commit | 1981c48e60b6398f145f075eddb121efe6eaeea1 (patch) | |
| tree | 6e38a3645fe7e74b45f82a935efd659742a6a775 | |
| parent | af71942da2efa6e959e46643c29fb15e82408c0d (diff) | |
| parent | 29e673f8ede348eac6bc4e23c91c37240f480f4d (diff) | |
| download | php-git-1981c48e60b6398f145f075eddb121efe6eaeea1.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix CGI m4 config message when CGI is disabled
| -rw-r--r-- | sapi/cgi/config9.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 index f544426202..1935864be3 100644 --- a/sapi/cgi/config9.m4 +++ b/sapi/cgi/config9.m4 @@ -27,9 +27,9 @@ if test "$PHP_CGI" != "no"; then AC_MSG_CHECKING([whether cross-process locking is required by accept()]) case "`uname -sr`" in - IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) + IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) AC_MSG_RESULT([yes]) - AC_DEFINE([USE_LOCKING], [1], + AC_DEFINE([USE_LOCKING], [1], [Define if cross-process locking is required by accept()]) ;; *) @@ -74,5 +74,5 @@ if test "$PHP_CGI" != "no"; then PHP_OUTPUT(sapi/cgi/php-cgi.1) else - AC_MSG_RESULT(yes) + AC_MSG_RESULT(no) fi |