Omitted bits from rev11198

diff --git a/src/err_type.h b/src/err_type.h
index fc131b3ce0bfeead2958fd9be9543da99736354a..e919310c108314684e366f0f7c481037e6d5a5c9 100644 (file)
--- a/src/err_type.h
+++ b/src/err_type.h
@@ -52,6 +52,9 @@ typedef enum {
     /* ICAP Errors */
     ERR_ICAP_FAILURE,
 
+    /* Squid problem */
+    ERR_GATEWAY_FAILURE,
+
     /* Special Cases */
     ERR_DIR_LISTING,            /* Display of remote directory (FTP, Gopher) */
     ERR_SQUID_SIGNATURE,        /* not really an error */

diff --git a/src/redirect.cc b/src/redirect.cc
index d84e841df9a7ce22b1d1378932ef024ed592aa29..3ad959631a2eb8641f719419beae1f72d8169404 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -194,14 +194,14 @@ redirectStart(ClientHttpRequest * http, RH * handler, void *data)
       clientStreamNode *node = (clientStreamNode *)http->client_stream.tail->prev->data;
       clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
       assert (repContext);
-      IpAddress tmpnoaddr;
+      Ip::Address tmpnoaddr;
       tmpnoaddr.SetNoAddr();
       repContext->setReplyToError(ERR_GATEWAY_FAILURE, status,
                                  http->request->method, NULL,
                                  http->getConn() != NULL ? http->getConn()->peer : tmpnoaddr,
                                  http->request,
                                  NULL,
-                                 http->getConn() != NULL && http->getConn()->auth_user_request ?
+                                 http->getConn() != NULL && http->getConn()->auth_user_request != NULL ?
                                  http->getConn()->auth_user_request : http->request->auth_user_request);
 
       node = (clientStreamNode *)http->client_stream.tail->data;