Reverse the errors from bad merges that were found while

rebuilding the repository.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83819 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 1e6d2e3cdfabb7945dac61949d974dec3b988aa5..690914e31932105221339bebb78262cbdae62d68 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1558,9 +1558,6 @@ API_EXPORT(void) ap_send_http_header(request_rec *r)
         r->sent_bodyct = 1;
         return;
     }
-    else {
-       fixup_vary(r);
-    }
 
     /*
      * Now that we are ready to send a response, we need to combine the two
@@ -1581,6 +1578,9 @@ API_EXPORT(void) ap_send_http_header(request_rec *r)
        r->proto_num = HTTP_VERSION(1,0);
        ap_table_set(r->subprocess_env, "force-response-1.0", "1");
     }
+    else {
+       fixup_vary(r);
+    }
 
     ap_basic_http_header(r);
 

diff --git a/server/config.c b/server/config.c
index d9f694c81d80b3e580baaed1d4ac777ed6d059f1..30152b99b02bdc6415536465cd59a95c048183df 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1088,27 +1088,28 @@ int ap_parse_htaccess(void **result, request_rec *r, int override,
 
     /* loop through the access names and find the first one */
 
-    while (!f && access_name[0]) {
-        char * w = ap_getword_conf(r->pool, &access_name);
-        filename = ap_make_full_path(r->pool, d, w);
-       f = ap_pcfg_openfile(r->pool, filename);
-    }
-    if (f) {
-        dc = ap_create_per_dir_config(r->pool);
+    while (access_name[0]) {
+        filename = ap_make_full_path(r->pool, d,
+                                     ap_getword_conf(r->pool, &access_name));
 
-       parms.config_file = f;
+        if ((f = ap_pcfg_openfile(r->pool, filename)) != NULL) {
 
-       errmsg = ap_srm_command_loop(&parms, dc);
+            dc = ap_create_per_dir_config(r->pool);
 
-       ap_cfg_closefile(f);
+            parms.config_file = f;
 
-       if (errmsg) {
-           ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
-                         "%s: %s", filename, errmsg);
-           return HTTP_INTERNAL_SERVER_ERROR;
-       }
-       *result = dc;
-    }
+            errmsg = ap_srm_command_loop(&parms, dc);
+
+            ap_cfg_closefile(f);
+
+            if (errmsg) {
+                ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r,
+                              "%s: %s", filename, errmsg);
+                return HTTP_INTERNAL_SERVER_ERROR;
+            }
+            *result = dc;
+            break;
+        }
         else if (errno != ENOENT && errno != ENOTDIR) {
             ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
                           "%s pcfg_openfile: unable to check htaccess file, "