fielding 99/08/27 15:03:20
Modified: src/main alloc.c http_config.c http_protocol.c
Log:
Reverse the errors from bad merges that were found while
rebuilding the repository.
Revision Changes Path
1.5 +7 -7 apache-2.0/src/main/alloc.c
Index: alloc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alloc.c 1999/08/26 15:17:06 1.4
+++ alloc.c 1999/08/27 22:03:05 1.5
@@ -2074,14 +2074,14 @@
if (pipe_in) {
close(in_fds[0]);
close(in_fds[1]);
- }
+ }
if (pipe_out) {
close(out_fds[0]);
close(out_fds[1]);
- }
+ }
errno = save_errno;
return 0;
- }
+ }
#ifdef WIN32
@@ -2230,10 +2230,10 @@
close(out_fds[0]);
close(out_fds[1]);
}
- if (pipe_err) {
+ if (pipe_err) {
close(err_fds[0]);
close(err_fds[1]);
- }
+ }
errno = save_errno;
return 0;
}
@@ -2254,11 +2254,11 @@
close(in_fds[0]);
}
- if (pipe_err) {
+ if (pipe_err) {
close(err_fds[0]);
dup2(err_fds[1], STDERR_FILENO);
close(err_fds[1]);
- }
+ }
/* HP-UX SIGCHLD fix goes here, if someone will remind me what it is...
*/
signal(SIGCHLD, SIG_DFL); /* Was that it? */
1.6 +22 -21 apache-2.0/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- http_config.c 1999/08/26 16:30:34 1.5
+++ http_config.c 1999/08/27 22:03:06 1.6
@@ -1088,27 +1088,28 @@
/* 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);
-
- parms.config_file = f;
-
- 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;
- }
+ while (access_name[0]) {
+ filename = ap_make_full_path(r->pool, d,
+ ap_getword_conf(r->pool, &access_name));
+
+ if ((f = ap_pcfg_openfile(r->pool, filename)) != NULL) {
+
+ dc = ap_create_per_dir_config(r->pool);
+
+ parms.config_file = f;
+
+ 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, "
1.10 +3 -3 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- http_protocol.c 1999/08/26 16:30:36 1.9
+++ http_protocol.c 1999/08/27 22:03:06 1.10
@@ -1558,9 +1558,6 @@
r->sent_bodyct = 1;
return;
}
- else {
- fixup_vary(r);
- }
/*
* Now that we are ready to send a response, we need to combine the two
@@ -1580,6 +1577,9 @@
ap_table_unset(r->headers_out, "Vary");
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);
