From 935d90e872025f20a60b08d8995adacdcc54e298 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Sun, 9 Dec 2007 14:46:56 +0000 Subject: [PATCH] Merge r599589 from trunk: * Detabify and make spacing in HTML code the same as before r593816. This avoids that the autoindex test (t/modules/autoindex) fails. Adjusting the autoindex test would cause it to fail with older versions and would make it harder to recognize regressions. Submitted by: rpluem Reviewed by: rpluem, jim, fuankg git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602678 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 10 ---------- modules/generators/mod_autoindex.c | 12 ++++++------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/STATUS b/STATUS index 52b4fcd61b5..47fd23fc3a1 100644 --- a/STATUS +++ b/STATUS @@ -89,16 +89,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: (NWGNUsubstitute need also be copied over from trunk, is missing in your patch) +1: jim, rpluem, fuankg - * mod_autoindex: make spacing in HTML code the same as before r593816. This - avoids that the autoindex test (t/modules/autoindex) fails. Adjusting - the autoindex test would cause it to fail with older versions and would - make it harder to recognize regressions. - Trunk version of patch: - http://svn.apache.org/viewcvs.cgi?rev=599589&view=rev - Backport version for 2.2.x of patch: - Trunk version of patch works - +1: rpluem, jim, fuankg - * core: Fix broken chunk filtering that causes all non blocking reads to be converted into blocking reads PR 19954 / 41056 diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index 306208ddebc..3e8153c1535 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -162,14 +162,14 @@ static void emit_preamble(request_rec *r, int xhtml, const char *title) if (xhtml) { ap_rvputs(r, DOCTYPE_XHTML_1_0T, - "\n" - "\n Index of ", title, - "\n", NULL); + "\n" + " \n Index of ", title, + "\n", NULL); } else { ap_rvputs(r, DOCTYPE_HTML_3_2, - "\n \n" - "Index of ", title, - "\n", NULL); + "\n \n" + " Index of ", title, + "\n", NULL); } if (d->style_sheet != NULL) { -- 2.47.2