From beeefb45269f45ea717f58b30a0985951ae23c20 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 4 Apr 2013 21:50:45 +0000 Subject: Renaming HTTP_HEADER_* into HTTP_IN_HEADER_* and HTTP_OUT_HEADER_* to make it more clear which header strings should be used for incoming vs outgoing situations. Using constants for commonly used llhttpnode context strings. --- indra/llmessage/llavatarnamecache.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/llmessage/llavatarnamecache.cpp') diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 1d01b69969..e0b71acbd5 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -711,13 +711,9 @@ bool LLAvatarNameCache::expirationFromCacheControl(const LLSD& headers, F64 *exp // Allow the header to override the default std::string cache_control; - if (headers.has(HTTP_HEADER_CACHE_CONTROL)) + if (headers.has(HTTP_IN_HEADER_CACHE_CONTROL)) { - cache_control = headers[HTTP_HEADER_CACHE_CONTROL].asString(); - } - else if (headers.has(HTTP_HEADER_LOWER_CACHE_CONTROL)) - { - cache_control = headers[HTTP_HEADER_LOWER_CACHE_CONTROL].asString(); + cache_control = headers[HTTP_IN_HEADER_CACHE_CONTROL].asString(); } if (!cache_control.empty()) -- cgit v1.2.3