You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by be...@hyperreal.org on 1998/06/27 20:09:35 UTC
cvs commit: apache-1.3/src/modules/standard mod_cgi.c mod_env.c mod_include.c mod_rewrite.c mod_setenvif.c
ben 98/06/27 11:09:35
Modified: src/include alloc.h
src/main http_protocol.c http_request.c util_script.c
src/modules/proxy proxy_http.c
src/modules/standard mod_cgi.c mod_env.c mod_include.c
mod_rewrite.c mod_setenvif.c
Log:
Two more that were missed in the Great Renaming.
Revision Changes Path
1.61 +2 -2 apache-1.3/src/include/alloc.h
Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- alloc.h 1998/06/13 15:22:48 1.60
+++ alloc.h 1998/06/27 18:09:28 1.61
@@ -197,8 +197,8 @@
* placing it here we are able to get compile-time diagnostics from modules
* written which assume that a table is the same as an array_header. -djg
*/
-#define table_elts(t) ((array_header *)(t))
-#define is_empty_table(t) (((t) == NULL)||(((array_header *)(t))->nelts == 0))
+#define ap_table_elts(t) ((array_header *)(t))
+#define ap_is_empty_table(t) (((t) == NULL)||(((array_header *)(t))->nelts == 0))
/* routines to remember allocation of other sorts of things...
* generic interface first. Note that we want to have two separate
1.221 +2 -2 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.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- http_protocol.c 1998/06/14 21:10:20 1.220
+++ http_protocol.c 1998/06/27 18:09:29 1.221
@@ -1224,7 +1224,7 @@
* header field tables into a single table. If we don't do this, our
* later attempts to set or unset a given fieldname might be bypassed.
*/
- if (!is_empty_table(r->err_headers_out))
+ if (!ap_is_empty_table(r->err_headers_out))
r->headers_out = ap_overlay_tables(r->pool, r->err_headers_out,
r->headers_out);
@@ -1967,7 +1967,7 @@
* message body. Note that being assbackwards here is not an option.
*/
if (status == HTTP_NOT_MODIFIED) {
- if (!is_empty_table(r->err_headers_out))
+ if (!ap_is_empty_table(r->err_headers_out))
r->headers_out = ap_overlay_tables(r->pool, r->err_headers_out,
r->headers_out);
ap_hard_timeout("send 304", r);
1.124 +1 -1 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.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- http_request.c 1998/06/13 15:22:53 1.123
+++ http_request.c 1998/06/27 18:09:29 1.124
@@ -1213,7 +1213,7 @@
static table *rename_original_env(pool *p, table *t)
{
- array_header *env_arr = table_elts(t);
+ array_header *env_arr = ap_table_elts(t);
table_entry *elts = (table_entry *) env_arr->elts;
table *new = ap_make_table(p, env_arr->nalloc);
int i;
1.120 +2 -2 apache-1.3/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- util_script.c 1998/06/23 23:14:07 1.119
+++ util_script.c 1998/06/27 18:09:29 1.120
@@ -152,7 +152,7 @@
API_EXPORT(char **) ap_create_environment(pool *p, table *t)
{
- array_header *env_arr = table_elts(t);
+ array_header *env_arr = ap_table_elts(t);
table_entry *elts = (table_entry *) env_arr->elts;
char **env = (char **) ap_palloc(p, (env_arr->nelts + 2) * sizeof(char *));
int i, j;
@@ -200,7 +200,7 @@
#endif
const char *host;
- array_header *hdrs_arr = table_elts(r->headers_in);
+ array_header *hdrs_arr = ap_table_elts(r->headers_in);
table_entry *hdrs = (table_entry *) hdrs_arr->elts;
int i;
1.51 +1 -1 apache-1.3/src/modules/proxy/proxy_http.c
Index: proxy_http.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_http.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- proxy_http.c 1998/06/23 07:31:08 1.50
+++ proxy_http.c 1998/06/27 18:09:31 1.51
@@ -307,7 +307,7 @@
else
ap_bputs(CRLF, f);
- reqhdrs_arr = table_elts(r->headers_in);
+ reqhdrs_arr = ap_table_elts(r->headers_in);
reqhdrs = (table_entry *) reqhdrs_arr->elts;
for (i = 0; i < reqhdrs_arr->nelts; i++) {
if (reqhdrs[i].key == NULL || reqhdrs[i].val == NULL
1.82 +2 -2 apache-1.3/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_cgi.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mod_cgi.c 1998/06/13 15:23:08 1.81
+++ mod_cgi.c 1998/06/27 18:09:31 1.82
@@ -195,7 +195,7 @@
static int log_script(request_rec *r, cgi_server_conf * conf, int ret,
char *dbuf, const char *sbuf, BUFF *script_in, BUFF *script_err)
{
- array_header *hdrs_arr = table_elts(r->headers_in);
+ array_header *hdrs_arr = ap_table_elts(r->headers_in);
table_entry *hdrs = (table_entry *) hdrs_arr->elts;
char argsbuffer[HUGE_STRING_LEN];
FILE *f;
@@ -233,7 +233,7 @@
}
fputs("%response\n", f);
- hdrs_arr = table_elts(r->err_headers_out);
+ hdrs_arr = ap_table_elts(r->err_headers_out);
hdrs = (table_entry *) hdrs_arr->elts;
for (i = 0; i < hdrs_arr->nelts; ++i) {
1.24 +1 -1 apache-1.3/src/modules/standard/mod_env.c
Index: mod_env.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_env.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_env.c 1998/04/11 12:00:46 1.23
+++ mod_env.c 1998/06/27 18:09:32 1.24
@@ -145,7 +145,7 @@
new_table = ap_copy_table(p, base->vars);
- arr = table_elts(add->vars);
+ arr = ap_table_elts(add->vars);
elts = (table_entry *)arr->elts;
for (i = 0; i < arr->nelts; ++i) {
1.96 +1 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- mod_include.c 1998/06/13 15:23:09 1.95
+++ mod_include.c 1998/06/27 18:09:32 1.96
@@ -2047,7 +2047,7 @@
{
char tag[MAX_STRING_LEN];
char *tag_val;
- array_header *arr = table_elts(r->subprocess_env);
+ array_header *arr = ap_table_elts(r->subprocess_env);
table_entry *elts = (table_entry *) arr->elts;
int i;
1.119 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- mod_rewrite.c 1998/06/16 14:03:38 1.118
+++ mod_rewrite.c 1998/06/27 18:09:32 1.119
@@ -3703,7 +3703,7 @@
table_entry *hdrs;
int i;
- hdrs_arr = table_elts(r->headers_in);
+ hdrs_arr = ap_table_elts(r->headers_in);
hdrs = (table_entry *)hdrs_arr->elts;
for (i = 0; i < hdrs_arr->nelts; ++i) {
if (hdrs[i].key == NULL) {
1.23 +1 -1 apache-1.3/src/modules/standard/mod_setenvif.c
Index: mod_setenvif.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_setenvif.c 1998/05/02 11:15:13 1.22
+++ mod_setenvif.c 1998/06/27 18:09:33 1.23
@@ -361,7 +361,7 @@
}
if (!regexec(b->preg, val, 0, NULL, 0)) {
- array_header *arr = table_elts(b->features);
+ array_header *arr = ap_table_elts(b->features);
elts = (table_entry *) arr->elts;
for (j = 0; j < arr->nelts; ++j) {