rse 98/08/25 02:15:45
Modified: src CHANGES
src/include ap_mmn.h httpd.h
src/main http_protocol.c
src/modules/proxy mod_proxy.c proxy_cache.c
src/modules/standard mod_alias.c mod_asis.c mod_dir.c
mod_expires.c mod_include.c mod_rewrite.c
Log:
Renamed is_HTTP_xxx() macros to ap_is_HTTP_xxx() name. They are used inside
modules as API functions and we forgot them at the big symbol renaming.
Suggested by: Doug MacEachern
Performed by: Ralf S. Engelschall
Revision Changes Path
1.1033 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1032
retrieving revision 1.1033
diff -u -r1.1032 -r1.1033
--- CHANGES 1998/08/24 18:39:21 1.1032
+++ CHANGES 1998/08/25 09:15:26 1.1033
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) Renamed is_HTTP_xxx() macros to ap_is_HTTP_xxx() name. They are used
inside
+ modules as API functions and we forgot them at the big symbol renaming.
+ [Ralf S. Engelschall]
+
*) Remove bad reference to non-existing SERVER_VERSION in mod_rewrite.html
[Youichirou Koga <[EMAIL PROTECTED]>] PR#2895
1.5 +2 -1 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ap_mmn.h 1998/08/16 20:21:25 1.4
+++ ap_mmn.h 1998/08/25 09:15:29 1.5
@@ -171,10 +171,11 @@
* ap_proxy_del_header(). Change interface of
* ap_proxy_send_fb() and ap_proxy_cache_error().
* Add ap_proxy_send_hdr_line() and ap_proxy_bputs2().
+ * 19980825 (1.3.2-dev) - renamed is_HTTP_xxx() macros to ap_is_HTTP_xxx()
*/
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 19980816
+#define MODULE_MAGIC_NUMBER_MAJOR 19980825
#endif
#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR /* backward
compat */
1.239 +6 -6 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- httpd.h 1998/08/16 20:51:54 1.238
+++ httpd.h 1998/08/25 09:15:29 1.239
@@ -503,12 +503,12 @@
#define BAD_GATEWAY HTTP_BAD_GATEWAY
#define VARIANT_ALSO_VARIES HTTP_VARIANT_ALSO_VARIES
-#define is_HTTP_INFO(x) (((x) >= 100)&&((x) < 200))
-#define is_HTTP_SUCCESS(x) (((x) >= 200)&&((x) < 300))
-#define is_HTTP_REDIRECT(x) (((x) >= 300)&&((x) < 400))
-#define is_HTTP_ERROR(x) (((x) >= 400)&&((x) < 600))
-#define is_HTTP_CLIENT_ERROR(x) (((x) >= 400)&&((x) < 500))
-#define is_HTTP_SERVER_ERROR(x) (((x) >= 500)&&((x) < 600))
+#define ap_is_HTTP_INFO(x) (((x) >= 100)&&((x) < 200))
+#define ap_is_HTTP_SUCCESS(x) (((x) >= 200)&&((x) < 300))
+#define ap_is_HTTP_REDIRECT(x) (((x) >= 300)&&((x) < 400))
+#define ap_is_HTTP_ERROR(x) (((x) >= 400)&&((x) < 600))
+#define ap_is_HTTP_CLIENT_ERROR(x) (((x) >= 400)&&((x) < 500))
+#define ap_is_HTTP_SERVER_ERROR(x) (((x) >= 500)&&((x) < 600))
#define status_drops_connection(x) (((x) == HTTP_BAD_REQUEST) || \
((x) == HTTP_REQUEST_TIME_OUT) || \
1.239 +3 -3 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.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- http_protocol.c 1998/08/14 02:49:50 1.238
+++ http_protocol.c 1998/08/25 09:15:31 1.239
@@ -391,7 +391,7 @@
* complicated.
*/
- if (!is_HTTP_SUCCESS(r->status) || r->no_local_copy) {
+ if (!ap_is_HTTP_SUCCESS(r->status) || r->no_local_copy) {
return OK;
}
@@ -588,7 +588,7 @@
status = ap_parse_uri_components(r->pool, uri, &r->parsed_uri);
}
- if (is_HTTP_SUCCESS(status)) {
+ if (ap_is_HTTP_SUCCESS(status)) {
/* if it has a scheme we may need to do absoluteURI vhost stuff */
if (r->parsed_uri.scheme
&& !strcasecmp(r->parsed_uri.scheme, ap_http_method(r))) {
@@ -2053,7 +2053,7 @@
ap_clear_table(r->err_headers_out);
if (location && *location
- && (is_HTTP_REDIRECT(status) || status == HTTP_CREATED))
+ && (ap_is_HTTP_REDIRECT(status) || status == HTTP_CREATED))
ap_table_setn(r->headers_out, "Location", location);
r->content_language = NULL;
1.61 +1 -1 apache-1.3/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mod_proxy.c 1998/08/16 20:51:55 1.60
+++ mod_proxy.c 1998/08/25 09:15:33 1.61
@@ -330,7 +330,7 @@
/* If the host doesn't have a domain name, add one and redirect. */
if (conf->domain != NULL) {
rc = proxy_needsdomain(r, url, conf->domain);
- if (is_HTTP_REDIRECT(rc))
+ if (ap_is_HTTP_REDIRECT(rc))
return HTTP_MOVED_PERMANENTLY;
}
1.51 +1 -1 apache-1.3/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- proxy_cache.c 1998/08/16 20:21:27 1.50
+++ proxy_cache.c 1998/08/25 09:15:34 1.51
@@ -823,7 +823,7 @@
* protocol requests nocache (e.g. ftp with user/password)
*/
/* @@@ XXX FIXME: is the test "r->status != HTTP_MOVED_PERMANENTLY" corerct?
- * or shouldn't it be "is_HTTP_REDIRECT(r->status)" ? -MnKr */
+ * or shouldn't it be "ap_is_HTTP_REDIRECT(r->status)" ? -MnKr */
if ((r->status != HTTP_OK && r->status != HTTP_MOVED_PERMANENTLY &&
r->status != HTTP_NOT_MODIFIED) ||
(expire != NULL && expc == BAD_DATE) ||
(r->status == HTTP_NOT_MODIFIED && (c == NULL || c->fp == NULL)) ||
1.38 +3 -3 apache-1.3/src/modules/standard/mod_alias.c
Index: mod_alias.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_alias.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_alias.c 1998/07/08 17:47:13 1.37
+++ mod_alias.c 1998/08/25 09:15:36 1.38
@@ -190,7 +190,7 @@
return "Regular expression could not be compiled.";
}
- if (is_HTTP_REDIRECT(status)) {
+ if (ap_is_HTTP_REDIRECT(status)) {
if (!url)
return "URL to redirect to is missing";
if (!use_regex && !ap_is_url(url))
@@ -357,7 +357,7 @@
return DECLINED;
if ((ret = try_alias_list(r, serverconf->redirects, 1, &status)) !=
NULL) {
- if (is_HTTP_REDIRECT(status)) {
+ if (ap_is_HTTP_REDIRECT(status)) {
/* include QUERY_STRING if any */
if (r->args) {
ret = ap_pstrcat(r->pool, ret, "?", r->args, NULL);
@@ -386,7 +386,7 @@
/* It may have changed since last time, so try again */
if ((ret = try_alias_list(r, dirconf->redirects, 1, &status)) != NULL) {
- if (is_HTTP_REDIRECT(status))
+ if (ap_is_HTTP_REDIRECT(status))
ap_table_setn(r->headers_out, "Location", ret);
return status;
}
1.30 +1 -1 apache-1.3/src/modules/standard/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_asis.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_asis.c 1998/08/06 17:30:53 1.29
+++ mod_asis.c 1998/08/25 09:15:37 1.30
@@ -89,7 +89,7 @@
location = ap_table_get(r->headers_out, "Location");
if (location && location[0] == '/' &&
- ((r->status == HTTP_OK) || is_HTTP_REDIRECT(r->status))) {
+ ((r->status == HTTP_OK) || ap_is_HTTP_REDIRECT(r->status))) {
ap_pfclose(r->pool, f);
1.51 +1 -1 apache-1.3/src/modules/standard/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_dir.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mod_dir.c 1998/04/11 12:00:46 1.50
+++ mod_dir.c 1998/08/25 09:15:37 1.51
@@ -176,7 +176,7 @@
/* If the request returned a redirect, propagate it to the client */
- if (is_HTTP_REDIRECT(rr->status) ||
+ if (ap_is_HTTP_REDIRECT(rr->status) ||
(rr->status == HTTP_NOT_ACCEPTABLE && num_names == 1)) {
error_notfound = rr->status;
1.30 +1 -1 apache-1.3/src/modules/standard/mod_expires.c
Index: mod_expires.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_expires.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_expires.c 1998/08/06 17:30:57 1.29
+++ mod_expires.c 1998/08/25 09:15:38 1.30
@@ -407,7 +407,7 @@
time_t expires;
char age[20];
- if (is_HTTP_ERROR(r->status)) /* Don't add Expires headers to
errors */
+ if (ap_is_HTTP_ERROR(r->status)) /* Don't add Expires headers to
errors */
return DECLINED;
if (r->main != NULL) /* Say no to subrequests */
1.103 +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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mod_include.c 1998/08/09 17:36:29 1.102
+++ mod_include.c 1998/08/25 09:15:38 1.103
@@ -607,7 +607,7 @@
/* Run it. */
rr_status = ap_run_sub_req(rr);
- if (is_HTTP_REDIRECT(rr_status)) {
+ if (ap_is_HTTP_REDIRECT(rr_status)) {
const char *location = ap_table_get(rr->headers_out, "Location");
location = ap_escape_html(rr->pool, location);
ap_rvputs(r, "<A HREF=\"", location, "\">", location, "</A>", NULL);
1.130 +3 -3 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.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- mod_rewrite.c 1998/08/13 01:55:15 1.129
+++ mod_rewrite.c 1998/08/25 09:15:39 1.130
@@ -853,7 +853,7 @@
else if (ap_isdigit(*val)) {
status = atoi(val);
}
- if (!is_HTTP_REDIRECT(status)) {
+ if (!ap_is_HTTP_REDIRECT(status)) {
return "RewriteRule: invalid HTTP response code "
"for flag 'R'";
}
@@ -1157,7 +1157,7 @@
}
/* determine HTTP redirect response code */
- if (is_HTTP_REDIRECT(r->status)) {
+ if (ap_is_HTTP_REDIRECT(r->status)) {
n = r->status;
r->status = HTTP_OK; /* make Apache kernel happy */
}
@@ -1446,7 +1446,7 @@
}
/* determine HTTP redirect response code */
- if (is_HTTP_REDIRECT(r->status)) {
+ if (ap_is_HTTP_REDIRECT(r->status)) {
n = r->status;
r->status = HTTP_OK; /* make Apache kernel happy */
}
