You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@hyperreal.org on 1998/09/22 20:33:53 UTC
cvs commit: apache-2.0/apache-nspr/modules/standard mod_cern_meta.c mod_include.c
dgaudet 98/09/22 11:33:53
Modified: apache-nspr/include ap_config.h
apache-nspr/main http_core.c http_main.c http_protocol.c
apache-nspr/modules/standard mod_cern_meta.c mod_include.c
Log:
it compiles now... but I haven't tried to run it
Revision Changes Path
1.3 +7 -1 apache-2.0/apache-nspr/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/apache-nspr/include/ap_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_config.h 1998/09/22 18:05:09 1.2
+++ ap_config.h 1998/09/22 18:33:49 1.3
@@ -63,10 +63,14 @@
#endif
/*
- * conf.h: system-dependant #defines and includes...
+ * ap_config.h: system-dependant #defines and includes...
* See PORTING for a listing of what they mean
*/
+#include "ap_mmn.h" /* MODULE_MAGIC_NUMBER_ */
+
+#include "ap_config_auto.h"
+
#include <stdlib.h>
#include <string.h>
@@ -160,6 +164,8 @@
#define HAVE_SYS_RESOURCE_H 1
#endif
#endif /* HAVE_SYS_RESOURCE_H */
+
+#include "ap_ctype.h"
#if defined(USE_HSREGEX)
#include "hsregex.h"
1.4 +0 -1 apache-2.0/apache-nspr/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_core.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- http_core.c 1998/09/22 18:05:17 1.3
+++ http_core.c 1998/09/22 18:33:50 1.4
@@ -572,7 +572,6 @@
|| hostname_lookups != HOSTNAME_LOOKUP_OFF)) {
old_stat = ap_update_child_status(conn->child_num, SERVER_BUSY_DNS,
(request_rec*)NULL);
-#endif /* STATUS */
if (PR_GetHostByAddr(&conn->remote_addr, hentbuf, sizeof(hentbuf), &hent)
== PR_SUCCESS) {
conn->remote_host = ap_pstrdup(conn->pool, hent.h_name);
1.5 +1 -1 apache-2.0/apache-nspr/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_main.c 1998/09/22 18:05:18 1.4
+++ http_main.c 1998/09/22 18:33:50 1.5
@@ -648,7 +648,7 @@
old_status = ss->status;
ss->status = status;
- if (ap_extended_server_status) {
+ if (ap_extended_status) {
if (status == SERVER_READY || status == SERVER_DEAD) {
/*
* Reset individual counters
1.4 +2 -5 apache-2.0/apache-nspr/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/http_protocol.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- http_protocol.c 1998/09/22 18:05:18 1.3
+++ http_protocol.c 1998/09/22 18:33:51 1.4
@@ -881,9 +881,7 @@
}
conn->timeout_name = "read request headers";
if (!r->assbackwards) {
- ap_hard_timeout("read request headers", r);
get_mime_headers(r);
- ap_kill_timeout(r);
if (r->status != HTTP_REQUEST_TIME_OUT) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
"request failed: error reading the headers");
@@ -1582,9 +1580,8 @@
if (len_to_read == 0) { /* Last chunk indicated, get footers */
if (r->read_body == REQUEST_CHUNKED_DECHUNK) {
- if (!get_mime_headers(r)) {
- return -1;
- }
+ /* XXX: we need to test if there was an error ... */
+ get_mime_headers(r);
ap_snprintf(buffer, bufsiz, "%ld", r->read_length);
ap_table_unset(r->headers_in, "Transfer-Encoding");
ap_table_setn(r->headers_in, "Content-Length",
1.4 +1 -1 apache-2.0/apache-nspr/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/apache-nspr/modules/standard/mod_cern_meta.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_cern_meta.c 1998/09/22 18:05:33 1.3
+++ mod_cern_meta.c 1998/09/22 18:33:52 1.4
@@ -229,7 +229,7 @@
/* XXX: this is very similar to ap_scan_script_header_err_core...
* are the differences deliberate, or just a result of bit rot?
*/
-static int scan_meta_file(request_rec *r, FILE *f)
+static int scan_meta_file(request_rec *r, BUFF *f)
{
char w[MAX_STRING_LEN];
char *l;
1.4 +3 -2 apache-2.0/apache-nspr/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/apache-nspr/modules/standard/mod_include.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_include.c 1998/09/22 18:05:36 1.3
+++ mod_include.c 1998/09/22 18:33:52 1.4
@@ -1039,14 +1039,15 @@
rr = ap_sub_req_lookup_file(tag_val, r);
- if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
+ if (rr->status == HTTP_OK && rr->file_exists) {
to_send = rr->filename;
- if ((ret = stat(to_send, finfo)) == -1) {
+ if (PR_GetFileInfo(to_send, finfo) != PR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
"unable to get information about \"%s\" "
"in parsed file %s",
to_send, r->filename);
ap_rputs(error, r);
+ ret = -1;
}
}
else {