dgaudet 98/01/30 16:15:45
Modified: src/main http_protocol.c http_request.c
Log:
(Recall: whenever a table's nelts == nalloc and a push is attempted
the table size will be doubled, and the old table copied to the new
table. It's nice to avoid this if it's easy.)
Our default server outputs 8 headers, with the expires module it will
do 10 headers. Increase the default r->headers_out table to size 12
to accomodate that (plus a cookie and one other thing).
rename_original_environment should use nalloc instead of nelts when
selecting a table size.
Revision Changes Path
1.183 +1 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- http_protocol.c 1998/01/28 11:33:21 1.182
+++ http_protocol.c 1998/01/31 00:15:43 1.183
@@ -786,7 +786,7 @@
r->headers_in = make_table(r->pool, 50);
r->subprocess_env = make_table(r->pool, 50);
- r->headers_out = make_table(r->pool, 5);
+ r->headers_out = make_table(r->pool, 12);
r->err_headers_out = make_table(r->pool, 5);
r->notes = make_table(r->pool, 5);
1.104 +2 -2 apache-1.3/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- http_request.c 1998/01/27 02:41:11 1.103
+++ http_request.c 1998/01/31 00:15:44 1.104
@@ -1162,7 +1162,7 @@
{
array_header *env_arr = table_elts(t);
table_entry *elts = (table_entry *) env_arr->elts;
- table *new = make_table(p, env_arr->nelts);
+ table *new = make_table(p, env_arr->nalloc);
int i;
for (i = 0; i < env_arr->nelts; ++i) {
@@ -1217,7 +1217,7 @@
new->main = r->main;
new->headers_in = r->headers_in;
- new->headers_out = make_table(r->pool, 5);
+ new->headers_out = make_table(r->pool, 12);
new->err_headers_out = r->err_headers_out;
new->subprocess_env = rename_original_env(r->pool, r->subprocess_env);
new->notes = make_table(r->pool, 5);
