From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 10 Sep 2013 10:32:39 +0000 (+0200)
Subject: Remove old header match code
X-Git-Tag: v1.3.62~7
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=0ff7436bf2ca0a279b1fefe0020ab862146306aa;p=metaproxy-moved-to-github.git

Remove old header match code
---

diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp
index 58243bf..0f7ea87 100644
--- a/src/filter_http_rewrite.cpp
+++ b/src/filter_http_rewrite.cpp
@@ -229,38 +229,12 @@ void yf::HttpRewrite::Phase::rewrite_headers(mp::odr & o,
             if (!it->header.empty() &&
                 regex_match(header->name, it->header))
             {
-#ifdef OLDHEADERMATCH                
-                // Matches and replaces the whole header line.
-                // This is good if you want to play with the header name too,
-                // but useless for patterns that want to anchor to the beginning
-                // or end of the header value, as we want to do with host-relative
-                // links. This code should probably be removed.
-                std::string sheader(header->name);
-                sheader += ": ";
-                sheader += header->value;
-
-                if (it->exec(vars, sheader, true))
-                {
-                    size_t pos = sheader.find(": ");
-                    if (pos == std::string::npos)
-                    {
-                        yaz_log(YLOG_LOG, "Header malformed during rewrite, ignoring");
-                        continue;
-                    }
-                    header->name = odr_strdup(
-                        o, sheader.substr(0, pos).c_str());
-                    header->value = odr_strdup(
-                        o, sheader.substr(pos + 2, std::string::npos).c_str());
-                }
-#else
                 // Match and replace only the header value
                 std::string hval(header->value);
                 if (it->exec(vars, hval, true))
                 {
                     header->value = odr_strdup(o, hval.c_str());
                 }
-                    
-#endif
             }
         }
     }