cvs commit: apache-1.3/src/main http_config.c
jim 98/09/25 08:42:13
Modified:src/main http_config.c
Log:
Change the order... Always allow valid 'f'
Revision ChangesPath
1.130 +2 -5 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- http_config.c 1998/09/25 15:26:05 1.129
+++ http_config.c 1998/09/25 15:42:12 1.130
@@ -1229,10 +1229,7 @@
filename = ap_make_full_path(r-pool, d, w);
f = ap_pcfg_openfile(r-pool, filename);
}
-if (!access_name[0]) {
- dc = NULL;
-}
-else if (f) {
+if (f) {
dc = ap_create_per_dir_config(r-pool);
parms.config_file = f;
@@ -1250,7 +1247,7 @@
*result = dc;
}
else {
- if (errno == ENOENT || errno == ENOTDIR)
+ if (errno == ENOENT || errno == ENOTDIR || (!access_name[0]))
dc = NULL;
else {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
cvs commit: apache-1.3 STATUS
coar98/09/25 12:33:39 Modified:.STATUS Log: Add notice of an available patch for +/- keywords on IndexOptions. Revision ChangesPath 1.494 +4 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.493 retrieving revision 1.494 diff -u -r1.493 -r1.494 --- STATUS1998/09/25 12:27:04 1.493 +++ STATUS1998/09/25 19:33:38 1.494 @@ -25,6 +25,10 @@ Available Patches: +* Ken's [PATCH] Add '+' and '-' to IndexOptions keywords + Message-ID: [EMAIL PROTECTED] + Status: Ken +1 + * Earle Ake: Apache 1.3.1 port to Pyramid DC/OSx [EMAIL PROTECTED]
cvs commit: apache-2.0 STATUS
coar98/09/25 12:45:01 Modified:.STATUS Log: Add another item for 2.0, that Great White Hope for Whirled Peas. Revision ChangesPath 1.41 +7 -1 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- STATUS1998/07/12 18:48:19 1.40 +++ STATUS1998/09/25 19:44:59 1.41 @@ -10,7 +10,7 @@ should add them to the repository now. Use a descriptive filename. -Other code will be copied over when 1.3.0 is finished. +Other code will be copied over when 1.3.? is finished. Showstoppers: Committed Code Changes: @@ -30,11 +30,17 @@ * Apache ports project - simple-to-install (a la CPAN) one-off tools, scripts (such as counters, guest books, et cetera) +1: Roy, Paul, Ken, Ralf, Martin + David Southwell has volunteered to work on this. * Embed API documentation in the source, a la Java docs, so a script can extract the parameters and description and build a dictionary. If we do this, it needs to be *mandatory* in the style guide. +1: Ken + + * Abstract the '+/-' capabilities of the Options keyword so other +directives can use it without re-inventing the square peg. + +1: Ken + Status: Ken has volunteered to work on this. * Really, really comply with 2068 (or whatever Roy says is the right document). Like handling Vary response fields properly and reliably.
cvs commit: apache-1.3/src/main http_config.c http_protocol.c
fielding98/09/25 15:45:01
Modified:src/main http_config.c http_protocol.c
Log:
Fix warnings and add error-notes to HTTP_REQUEST_URI_TOO_LARGE.
Revision ChangesPath
1.131 +4 -1 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- http_config.c 1998/09/25 15:42:12 1.130
+++ http_config.c 1998/09/25 22:45:00 1.131
@@ -1229,7 +1229,10 @@
filename = ap_make_full_path(r-pool, d, w);
f = ap_pcfg_openfile(r-pool, filename);
}
-if (f) {
+if (!access_name[0]) {
+ dc = NULL;
+}
+else if (f) {
dc = ap_create_per_dir_config(r-pool);
parms.config_file = f;
1.241 +7 -4 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- http_protocol.c 1998/09/25 12:27:05 1.240
+++ http_protocol.c 1998/09/25 22:45:00 1.241
@@ -2158,7 +2158,7 @@
case BAD_REQUEST:
ap_bputs(Your browser sent a request that\n, fd);
ap_bputs(this server could not understand.P\n, fd);
- if (error_notes = ap_table_get(r-notes, error-notes) != NULL) {
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
ap_bvputs(fd, error_notes, P\n, NULL);
}
break;
@@ -2195,7 +2195,7 @@
case LENGTH_REQUIRED:
ap_bvputs(fd, A request of the requested method , r-method,
requires a valid Content-length.P\n, NULL);
- if (error_notes = ap_table_get(r-notes, error-notes) != NULL) {
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
ap_bvputs(fd, error_notes, P\n, NULL);
}
break;
@@ -2238,7 +2238,10 @@
break;
case HTTP_REQUEST_URI_TOO_LARGE:
ap_bputs(The requested URL's length exceeds the capacity\n, fd);
- ap_bputs(limit for this server.\n, fd);
+ ap_bputs(limit for this server.P\n, fd);
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
+ ap_bvputs(fd, error_notes, P\n, NULL);
+ }
break;
case HTTP_UNSUPPORTED_MEDIA_TYPE:
ap_bputs(The supplied request data is not in a format\n, fd);
@@ -2263,7 +2266,7 @@
ap_bputs( and inform them of the time the error occurred,\n, fd);
ap_bputs(and anything you might have done that may have\n, fd);
ap_bputs(caused the error.P\n, fd);
- if (error_notes = ap_table_get(r-notes, error-notes) != NULL) {
+ if ((error_notes = ap_table_get(r-notes, error-notes)) != NULL) {
ap_bvputs(fd, error_notes, P\n, NULL);
}
break;
cvs commit: apache-1.3/src/main http_config.c
fielding98/09/25 15:49:39
Modified:src/main http_config.c
Log:
Ooops. Friday it is. Undo last unintended commit.
Revision ChangesPath
1.132 +1 -4 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- http_config.c 1998/09/25 22:45:00 1.131
+++ http_config.c 1998/09/25 22:49:38 1.132
@@ -1229,10 +1229,7 @@
filename = ap_make_full_path(r-pool, d, w);
f = ap_pcfg_openfile(r-pool, filename);
}
-if (!access_name[0]) {
- dc = NULL;
-}
-else if (f) {
+if (f) {
dc = ap_create_per_dir_config(r-pool);
parms.config_file = f;
