Merge pull request #8 from felfert/master

[FIXED JENKINS-5753] Winstone AJP13 SSL problem
jenkinsci · Jul 17, 2013 · 38a8431 · 38a8431
2 parents bb642ba + f5ee736
commit 38a8431
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/java/winstone/ajp13/Ajp13IncomingPacket.java b/src/java/winstone/ajp13/Ajp13IncomingPacket.java
@@ -158,8 +158,19 @@ public byte parsePacket(String encoding) throws IOException {
                 attName = readString(di,encoding);
             }
 
-            String attValue = readString (di,encoding);
+            if (type==0x0B) {
+                int intValue = di.readShort();
+                // SSL key size is not used. Furthermore, the map
+                // is supposed to contain only Strings anyway. So:
+                // just ignore this.
+                // this.attributes.put(attName, attValue);
+                Logger.log(Logger.FULL_DEBUG, Ajp13Listener.AJP_RESOURCES,
+                        "Ajp13IncomingPacket.Attribute", attName,
+                        intValue);
+                continue;
+            }
 
+            String attValue = readString (di,encoding);
             this.attributes.put(attName, attValue);
             Logger.log(Logger.FULL_DEBUG, Ajp13Listener.AJP_RESOURCES,
                     "Ajp13IncomingPacket.Attribute", attName,