archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Fix CGI m4 config message when CGI is disabled
This commit is contained in:
Joe Watkins 2017-09-27 06:20:46 +01:00
commit b0950ff854
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sapi/cgi/config9.m4
View file

@ -27,9 +27,9 @@ if test "$PHP_CGI" != "no"; then
AC_MSG_CHECKING([whether cross-process locking is required by accept()]) AC_MSG_CHECKING([whether cross-process locking is required by accept()])
case "`uname -sr`" in 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_MSG_RESULT([yes])
AC_DEFINE([USE_LOCKING], [1], AC_DEFINE([USE_LOCKING], [1],
[Define if cross-process locking is required by accept()]) [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) PHP_OUTPUT(sapi/cgi/php-cgi.1)
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(no)
fi fi