diff -Naur apache_1.3.9-10x-orig/10xpatchlevel apache_1.3.9/10xpatchlevel --- apache_1.3.9-10x-orig/10xpatchlevel +++ apache_1.3.9/10xpatchlevel Thu Jan 13 22:41:52 2000 @@ -0,0 +1,4 @@ +This file contains the patch level for the Accelerating Apache patches +available from http://oss.sgi.com/projects/apache. + +10xpatchlevel=1. diff -Naur apache_1.3.9-10x-orig/src/include/httpd.h apache_1.3.9/src/include/httpd.h --- apache_1.3.9-10x-orig/src/include/httpd.h Wed Dec 15 20:57:39 1999 +++ apache_1.3.9/src/include/httpd.h Thu Jan 13 22:34:07 2000 @@ -1191,7 +1191,7 @@ extern void qsc_init(pool *); extern int qsc_process_request(request_rec *); extern void qsc_insert_request(request_rec *, const char *, size_t, void *, - size_t, const char *); + size_t, const char *, const char *); extern void qsc_status(request_rec *, const char *); #endif diff -Naur apache_1.3.9-10x-orig/src/main/alloc.c apache_1.3.9/src/main/alloc.c --- apache_1.3.9-10x-orig/src/main/alloc.c Mon Dec 6 14:36:18 1999 +++ apache_1.3.9/src/main/alloc.c Thu Jan 13 22:34:36 2000 @@ -1031,6 +1031,9 @@ API_EXPORT(void *) ap_push_array(array_header *arr) { if (arr->nelts == arr->nalloc) { +#if defined(IRIX) && _MIPS_SIM != _ABIO32 +#pragma mips_frequency_hint NEVER +#endif int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2; char *new_data; diff -Naur apache_1.3.9-10x-orig/src/main/qsc.c apache_1.3.9/src/main/qsc.c --- apache_1.3.9-10x-orig/src/main/qsc.c Thu Sep 2 10:04:10 1999 +++ apache_1.3.9/src/main/qsc.c Thu Jan 13 22:34:44 2000 @@ -210,6 +210,7 @@ size_t nccheaderbytes; /* length of ccheaders */ void *body; /* mmap_static response body */ size_t nbodybytes; /* length of body */ + const char *nbodybytesstr; /* sprintf("%ld", (long) nbodybytes) */ #ifdef QSC_DEBUG const char *filename; /* name of mapped file */ #endif @@ -897,6 +898,11 @@ } } + /* keep logging happy */ + r->sent_bodyct = 1; + ap_table_addn(r->headers_out, "Content-Length", + ep->nbodybytesstr); + handled = 1; } else qsc_atomic_add(&sp->qsc_nmisses, 1); @@ -915,7 +921,7 @@ void qsc_insert_request(request_rec *r, const char *basic_header, size_t basic_header_len, void *body, size_t nbodybytes, - const char *filename) + const char *nbodybytesstr, const char *filename) { if (qsc && qsc_request_is_cachable(r) && qsc_response_is_cachable(r)) { array_header *ap; @@ -1132,6 +1138,7 @@ nheaderbytes + cclength; ep->body = body; ep->nbodybytes = nbodybytes; + ep->nbodybytesstr = nbodybytesstr; #ifdef QSC_DEBUG ep->filename = filename; #endif diff -Naur apache_1.3.9-10x-orig/src/modules/experimental/mod_mmap_static.c apache_1.3.9/src/modules/experimental/mod_mmap_static.c --- apache_1.3.9-10x-orig/src/modules/experimental/mod_mmap_static.c Thu Dec 16 10:37:51 1999 +++ apache_1.3.9/src/modules/experimental/mod_mmap_static.c Thu Jan 13 22:35:50 2000 @@ -434,7 +434,7 @@ basic_header_len = sizeof basic_header - basic_header_len; qsc_insert_request(r, basic_header, basic_header_len, - match->mm, match->finfo.st_size, match->filename); + match->mm, match->finfo.st_size, match->sizestr, match->filename); } #endif