github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2.5.x changes into trunk.

Browse Source
This commit is contained in:
b1v1r 2009-10-21 17:15:40 +00:00
parent a1a67592ff
commit 55f54e17e5
7 changed files with 114 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apache2/configure vendored
View File

@ -739,6 +739,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_errors
enable_verbose_output
enable_strict_compile
enable_debug_conf
@ -1383,6 +1384,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-errors Disable errors during configure.
--enable-verbose-output Enable more verbose configure output.
--enable-strict-compile Enable strict compilation (warnings are errors).
--enable-debug-conf Enable debug during configuration.
@ -5029,6 +5031,23 @@ MSC_REGRESSION_DOCROOT_DIR="$MSC_REGRESSION_SERVERROOT_DIR/htdocs"
### Configure Options
# Ignore configure errors
# Check whether --enable-errors was given.
if test "${enable_errors+set}" = set; then
enableval=$enable_errors;
if test "$enableval" != "no"; then
report_errors=1
else
report_errors=0
fi
else
report_errors=1
fi
# Verbose output
# Check whether --enable-verbose-output was given.
if test "${enable_verbose_output+set}" = set; then
@ -5051,7 +5070,7 @@ fi
if test "${enable_strict_compile+set}" = set; then
enableval=$enable_strict_compile;
if test "$enableval" != "no"; then
strict_compile="-std=c99 -Wstrict-overflow=1 -Wextra -Wno-missing-field-initializers -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-unused-parameter -Werror"
strict_compile="-std=c99 -Wstrict-overflow=1 -Wextra -Wno-missing-field-initializers -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-unused-parameter -Wformat -Wformat-security -Werror -fstack-protector -D_FORTIFY_SOURCE=2"
else
strict_compile=
fi
@ -5228,9 +5247,16 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
{ $as_echo "$as_me:$LINENO: httpd is recent enough" >&5
$as_echo "$as_me: httpd is recent enough" >&6;}
else
{ { $as_echo "$as_me:$LINENO: error: apache is too old" >&5
if test "$report_errors" -eq 1; then
{ { $as_echo "$as_me:$LINENO: error: apache is too old" >&5
$as_echo "$as_me: error: apache is too old" >&2;}
{ (exit mmn must be at least $HTTPD_WANTED_MMN); exit mmn must be at least $HTTPD_WANTED_MMN; }; }
else
{ $as_echo "$as_me:$LINENO: apache is too old" >&5
$as_echo "$as_me: apache is too old" >&mmn must be at least $HTTPD_WANTED_MMN;}
fi
fi
rm -f conftest*
@ -5289,9 +5315,14 @@ $as_echo "$as_me: apxs LIBEXECDIR: $APXS_LIBEXECDIR" >&6;}; fi
if test "$verbose_output" -eq 1; then { $as_echo "$as_me:$LINENO: apxs HTTPD: $APXS_HTTPD" >&5
$as_echo "$as_me: apxs HTTPD: $APXS_HTTPD" >&6;}; fi
else
{ { $as_echo "$as_me:$LINENO: error: couldn't find APXS" >&5
if test "$report_errors" -eq 1; then
{ { $as_echo "$as_me:$LINENO: error: couldn't find APXS" >&5
$as_echo "$as_me: error: couldn't find APXS" >&2;}
{ (exit 1); exit 1; }; }
else
{ $as_echo "$as_me:$LINENO: couldn't find APXS" >&5
$as_echo "$as_me: couldn't find APXS" >&6;}
fi
fi
# Include M4 macros

31
apache2/configure.in
View File

@ -63,6 +63,21 @@ AC_SUBST(MSC_REGRESSION_DOCROOT_DIR)
### Configure Options
# Ignore configure errors
AC_ARG_ENABLE(errors,
AS_HELP_STRING([--disable-errors],
[Disable errors during configure.]),
[
if test "$enableval" != "no"; then
report_errors=1
else
report_errors=0
fi
],
[
report_errors=1
])
# Verbose output
AC_ARG_ENABLE(verbose-output,
AS_HELP_STRING([--enable-verbose-output],
@ -84,7 +99,7 @@ AC_ARG_ENABLE(strict-compile,
[Enable strict compilation (warnings are errors).]),
[
if test "$enableval" != "no"; then
strict_compile="-std=c99 -Wstrict-overflow=1 -Wextra -Wno-missing-field-initializers -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-unused-parameter -Werror"
strict_compile="-std=c99 -Wstrict-overflow=1 -Wextra -Wno-missing-field-initializers -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-unused-parameter -Wformat -Wformat-security -Werror -fstack-protector -D_FORTIFY_SOURCE=2"
else
strict_compile=
fi
@ -231,7 +246,13 @@ if test -n "$APXS" -a "$APXS" != "no" -a -x "$APXS" ; then
VERSION_OK
#endif],
[AC_MSG_NOTICE(httpd is recent enough)],
[AC_MSG_ERROR(apache is too old, mmn must be at least $HTTPD_WANTED_MMN)])
[
if test "$report_errors" -eq 1; then
AC_MSG_ERROR(apache is too old, mmn must be at least $HTTPD_WANTED_MMN)
else
AC_MSG_NOTICE(apache is too old, mmn must be at least $HTTPD_WANTED_MMN)
fi
])
fi
APXS_INCLUDEDIR="`$APXS -q INCLUDEDIR`"
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs INCLUDEDIR: $APXS_INCLUDEDIR); fi
@ -274,7 +295,11 @@ VERSION_OK
fi
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs HTTPD: $APXS_HTTPD); fi
else
AC_MSG_ERROR(couldn't find APXS)
if test "$report_errors" -eq 1; then
AC_MSG_ERROR(couldn't find APXS)
else
AC_MSG_NOTICE(couldn't find APXS)
fi
fi
# Include M4 macros

45
doc/Makefile Normal file
View File

@ -0,0 +1,45 @@
FOP = /opt/fop/fop.sh
XALAN = /opt/fop/xalan.sh
JAVA_HOME = /usr/lib/jvm/java-6-sun
ALLDOCS = modsecurity2-apache-reference.pdf modsecurity2-data-formats.pdf modsecurity2-apache-reference.html modsecurity2-data-formats.html html-multipage/index.html index.html
all: $(ALLDOCS)
modsecurity2-apache-reference.pdf: modsecurity2-apache-reference.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(FOP) -q -xsl pdf.xsl -xml modsecurity2-apache-reference.xml -pdf modsecurity2-apache-reference.pdf;
modsecurity2-data-formats.pdf: modsecurity2-data-formats.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(FOP) -q -xsl pdf.xsl -xml modsecurity2-data-formats.xml -pdf modsecurity2-data-formats.pdf;
modsecurity2-apache-reference.html: modsecurity2-apache-reference.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(XALAN) -q -xsl html.xsl -in modsecurity2-apache-reference.xml -param base.dir ./; \
mv index.html modsecurity2-apache-reference.html;
modsecurity2-data-formats.html: modsecurity2-data-formats.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(XALAN) -q -xsl html.xsl -in modsecurity2-data-formats.xml -param base.dir ./; \
mv index.html modsecurity2-data-formats.html;
html-multipage/index.html: modsecurity2-apache-reference.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
mkdir html-multipage/; \
$(XALAN) -q -xsl html-chunked.xsl -in modsecurity2-apache-reference.xml -param base.dir html-multipage/; \
cp modsecurity-reference.css html-multipage/; \
cp modsecurity.gif html-multipage/; \
cp breach-logo-small.gif html-multipage/; \
cp apache_request_cycle-modsecurity.jpg html-multipage/
index.html: main-index.html
(cp main-index.html index.html && \
VERSION=`grep "<releaseinfo>.*</releaseinfo>" modsecurity2-apache-reference.xml | sed 's/[ \t]*<\/\?releaseinfo>[ \t]*//g'` && \
perl -pi -e "s/\\\$$version/$$VERSION/" index.html)
clean:
rm -rf docindex.html $(ALLDOCS) html-multipage
.PHONY: setup cleanup

4
doc/html-chunked.xsl
View File

@ -1,8 +1,8 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!--xsl:import href="/opt/docbook/xsl/html/chunk.xsl"/-->
<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
<xsl:import href="/opt/docbook/xsl/html/chunk.xsl"/>
<!--xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/-->
<xsl:param name="chunk.first.sections" select="1"/>
<xsl:param name="use.id.as.filename" select="1"/>

4
doc/html.xsl
View File

@ -1,8 +1,8 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!--xsl:import href="/opt/docbook/xsl/html/onechunk.xsl"/-->
<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/onechunk.xsl"/>
<xsl:import href="/opt/docbook/xsl/html/onechunk.xsl"/>
<!--xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/onechunk.xsl"/-->
<xsl:template name="user.header.navigation">
<div style="background:#F5F5F5;width:100%;border-top:1px solid #DDDDDD;border-bottom:1px solid #DDDDDD"><table cellpadding="0" cellspacing="0" width="100%"><tr><td><a href="http://www.modsecurity.org"><img border="0" alt="ModSecurity" height="36" width="120" src="modsecurity.gif" style="margin:4px"/></a></td><td align="right"><a href="http://www.breach.com"><img border="0" width="100" height="36" src="breach-logo-small.gif" style="margin:6px"/></a></td></tr></table></div>

2
doc/index.html → doc/main-index.html
View File

@ -18,7 +18,7 @@ height="36" width="100" border="0"></a></td></tr></table>
<h2>ModSecurity for Apache Documentation</h2>
<p>Version $version</p>
<p>$version</p>
<ul>
<li><a href="html-multipage/index.html">HTML, one page per chapter</a></li>

4
doc/pdf.xsl
View File

@ -5,8 +5,8 @@
version="1.0"
>
<!--xsl:import href="/opt/docbook/xsl/fo/docbook.xsl"/-->
<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl"/>
<xsl:import href="/opt/docbook/xsl/fo/docbook.xsl"/>
<!--xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl"/-->
<xsl:param name="paper.type" select="A4"/>