Second Life viewer sources 1.23.0-RC

1 files changed, 7 insertions, 9 deletions

diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index c76eec8..d1facbf 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -19,7 +19,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -286,11 +287,13 @@ class LLURLRequestComplete : public LLIOPipe
 {
 public:
         
+        // Called once for each header received, except status lines
         virtual void header(const std::string& header, const std::string& value);
-            ///< Called once for each header received, prior to httpStatus
 
-        virtual void httpStatus(U32 status, const std::string& reason);
-            ///< Always called on request completion, prior to complete
+        // May be called more than once, particularly for redirects and proxy madness.
+        // Ex. a 200 for a connection to https through a proxy, followed by the "real" status
+        //     a 3xx for a redirect followed by a "real" status, or more redirects.
+        virtual void httpStatus(U32 status, const std::string& reason) { }
 
         virtual void complete(
                 const LLChannelDescriptors& channels,
@@ -327,9 +330,6 @@ public:
         LLURLRequestComplete();
         virtual ~LLURLRequestComplete();
 
-        // The first line of an http response must be the status line
-        // true if we have already parsed this line.
-        bool haveHTTPStatus() const { return mHaveHTTPStatus; }
 protected:
         /* @name LLIOPipe virtual implementations
          */
@@ -348,8 +348,6 @@ protected:
         // value to note if we actually got the response. This value
         // depends on correct useage from the LLURLRequest instance.
         EStatus mRequestStatus;
-
-        bool mHaveHTTPStatus;
 };