fix headers to allow inclusion into C++ source

[thirdparty/squid.git] / src / errorpage.cc

diff --git a/src/errorpage.cc b/src/errorpage.cc
index bda2c501a7dcdf684da06687aebd7fa7e6f22adc..e87190f69be9d99593b32ba0f5ee067725e6dac1 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.176 2002/09/15 06:23:28 adrian Exp $
+ * $Id: errorpage.cc,v 1.177 2002/09/15 06:40:57 robertc Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -266,7 +266,7 @@ errorCon(err_type type, http_status status)
     err = cbdataAlloc(ErrorState);
     err->page_id = type;       /* has to be reset manually if needed */
     err->type = type;
-    err->http_status = status;
+    err->httpStatus = status;
     return err;
 }
 
@@ -358,7 +358,7 @@ errorSend(int fd, ErrorState * err)
      * the client side for logging and error tracking.
      */
     if (err->request)
-       err->request->err_type = err->type;
+       err->request->errType = err->type;
     /* moved in front of errorBuildBuf @?@ */
     err->flags.flag_cbdata = 1;
     rep = errorBuildReply(err);
@@ -681,10 +681,10 @@ errorBuildReply(ErrorState * err)
        char *quoted_url = rfc1738_escape_part(errorConvert('u', err));
        httpReplySetHeaders(rep, version, HTTP_MOVED_TEMPORARILY, NULL, "text/html", 0, 0, squid_curtime);
        httpHeaderPutStrf(&rep->header, HDR_LOCATION, name, quoted_url);
-       httpHeaderPutStrf(&rep->header, HDR_X_SQUID_ERROR, "%d %s\n", err->http_status, "Access Denied");
+       httpHeaderPutStrf(&rep->header, HDR_X_SQUID_ERROR, "%d %s\n", err->httpStatus, "Access Denied");
     } else {
        MemBuf content = errorBuildContent(err);
-       httpReplySetHeaders(rep, version, err->http_status, NULL, "text/html", content.size, 0, squid_curtime);
+       httpReplySetHeaders(rep, version, err->httpStatus, NULL, "text/html", content.size, 0, squid_curtime);
        /*
         * include some information for downstream caches. Implicit
         * replaceable content. This isn't quite sufficient. xerrno is not