diff options
| author | Stefan Fritsch <sf@debian.org> | 2008-02-23 10:10:16 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:36:51 +0100 |
| commit | 1db9a2698e23da88eae8578220c4e2552b0b15f7 (patch) | |
| tree | b186921a0fa518b430377f657bce6a31a6f34fe0 | |
| parent | e87d0431e8fe0ab89bf7873567f4a9243c5fe3bd (diff) | |
| download | apache2-1db9a2698e23da88eae8578220c4e2552b0b15f7.tar.gz | |
Print file name where "Useless use of AllowOverride" occured.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@595 01b336ce-410b-0410-9a02-a0e7f243c266
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rwxr-xr-x | debian/patches/054_filename_in_warning.dpatch | 21 |
3 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 32db3db3..bebbb6ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apache2 (2.2.8-2) UNRELEASED; urgency=low * Provide a fallback access log (other_vhosts_access.log) and a suitable LogFormat (vhost_combined) for VirtualHosts that don't define their own log file. (Closes: #313430) + * Print file name where "Useless use of AllowOverride" occured. + (Closes: #410334) -- Stefan Fritsch <sf@debian.org> Fri, 18 Jan 2008 21:12:01 +0100 diff --git a/debian/patches/00list b/debian/patches/00list index b8a0ddf2..931fcf1b 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -17,3 +17,4 @@ 099_config_guess_sub_update 052_logresolve_linelength.dpatch 053_bad_file_descriptor_PR42829.dpatch +054_filename_in_warning.dpatch diff --git a/debian/patches/054_filename_in_warning.dpatch b/debian/patches/054_filename_in_warning.dpatch new file mode 100755 index 00000000..e9ed3cb8 --- /dev/null +++ b/debian/patches/054_filename_in_warning.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 054_filename_in_warning.dpatch by Stefan Fritsch <sf@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Print the filename in which the error occured + +@DPATCH@ +diff -urNad trunk~/server/core.c trunk/server/core.c +--- trunk~/server/core.c 2008-02-19 21:40:16.000000000 +0100 ++++ trunk/server/core.c 2008-02-23 11:02:28.490211059 +0100 +@@ -1356,8 +1356,8 @@ + /* Throw a warning if we're in <Location> or <Files> */ + if (ap_check_cmd_context(cmd, NOT_IN_LOCATION | NOT_IN_FILES)) { + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, +- "Useless use of AllowOverride in line %d.", +- cmd->directive->line_num); ++ "Useless use of AllowOverride in line %d of %s.", ++ cmd->directive->line_num, cmd->directive->filename); + } + + d->override = OR_NONE; |