[jscover] 62/69: Header filtering from common method.

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch master
in repository jscover.

commit c079dc67e5066443aae855b25f1de3683d670211
Author: Jake Cobb <jcobb at us.fujitsu.com>
Date:   Thu Aug 14 13:28:47 2014 -0700

    Header filtering from common method.
---
 src/main/java/jscover/server/ProxyService.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/jscover/server/ProxyService.java b/src/main/java/jscover/server/ProxyService.java
index e9b0bea..a43f7a2 100644
--- a/src/main/java/jscover/server/ProxyService.java
+++ b/src/main/java/jscover/server/ProxyService.java
@@ -458,7 +458,11 @@ public class ProxyService {
     
     protected boolean shouldSendHeader(String header) {
         header = header.toLowerCase();
-        if ("proxy-connection".equals(header) || "accept-encoding".equals(header) || "connection".equals(header))
+        // don't allow keep-alive headers to override HTTP/1.0 default of non-persistent
+        if ("proxy-connection".equals(header) || "connection".equals(header))
+            return false;
+        //Don't want to allow GZIP header
+        if ("accept-encoding".equals(header))
             return false;
         return true;
     }
@@ -474,12 +478,7 @@ public class ProxyService {
         Map<String, List<String>> clientHeaders = request.getHeaders();
         if (clientHeaders != null) {
             for (String header : clientHeaders.keySet()) {
-                if (header.equalsIgnoreCase("accept-encoding")) {
-                    //Don't want to allow GZIP header
-                    continue;
-                }
-                if (header.equalsIgnoreCase("proxy-connection")) {
-                    //Should be ignored when using HTTP 1.0, but exclude anyway
+                if (!shouldSendHeader(header)) {
                     continue;
                 }
                 List<String> values = clientHeaders.get(header);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jscover.git