jani Fri Oct 5 12:34:48 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src configure.in
Log:
- Sync with configure.in from HEAD (the CGI stuff is as ini options nowadays)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.2&r2=1.579.2.52.2.77.2.3&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77.2.2
php-src/configure.in:1.579.2.52.2.77.2.3
--- php-src/configure.in:1.579.2.52.2.77.2.2 Mon Oct 1 12:40:53 2007
+++ php-src/configure.in Fri Oct 5 12:34:48 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.2 2007/10/01 12:40:53 jani Exp $ -*-
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.3 2007/10/05 12:34:48 jani Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1296,12 +1296,12 @@
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
-PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c getopt.c php_sprintf.c \
+PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \
safe_mode.c fopen_wrappers.c alloca.c php_scandir.c \
php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
network.c php_open_temporary_file.c php_logos.c \
- output.c )
+ output.c getopt.c)
PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
@@ -1435,21 +1435,6 @@
echo "| and make the changes described there and try again.
|"
fi
- # Warn about CGI version with no extra security options.
- if test "$PHP_SAPI" = "cgi"; then
- if test "$PHP_FORCE_CGI_REDIRECT" = "no" && test "$PHP_DISCARD_PATH" =
"no"; then
- echo
"+--------------------------------------------------------------------+"
- echo "| *** WARNING ***
|"
- echo "|
|"
- echo "| You will be compiling the CGI version of PHP without any
|"
- echo "| redirection checking. By putting this cgi binary somewhere in
|"
- echo "| your web space, users may be able to circumvent existing
.htaccess |"
- echo "| security by loading files directly through the parser. See
|"
- echo "| http://www.php.net/manual/security.php for more details.
|"
- fi
- fi
-
-
if test -n "$DEBUG_LOG"; then
rm -f config.cache
cat <<X
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
