From c74038237e17752b8787e0a42b5ef92438570cf6 Mon Sep 17 00:00:00 2001 From: remm Date: Tue, 10 Feb 2009 13:33:58 +0000 Subject: [PATCH] - Fix apparent bad cut & paste from the HTTP connector for parseHost, and use the code from the org.apache.jk connector instead. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@742962 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AjpAprProcessor.java | 10 +++++++--- java/org/apache/coyote/ajp/AjpProcessor.java | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index 5e977127f..14bcd9fcf 100644 --- a/java/org/apache/coyote/ajp/AjpAprProcessor.java +++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java @@ -848,9 +848,13 @@ public class AjpAprProcessor implements ActionHook { if (valueMB == null || (valueMB != null && valueMB.isNull()) ) { // HTTP/1.0 - // Default is what the socket tells us. Overriden if a host is - // found/parsed - request.setServerPort(endpoint.getPort()); + request.setServerPort(request.getLocalPort()); + try { + request.serverName().duplicate(request.localName()); + } catch (IOException e) { + response.setStatus(400); + error = true; + } return; } diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 32346b42c..ba2b8810f 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -854,9 +854,13 @@ public class AjpProcessor implements ActionHook { if (valueMB == null || (valueMB != null && valueMB.isNull()) ) { // HTTP/1.0 - // Default is what the socket tells us. Overriden if a host is - // found/parsed - request.setServerPort(endpoint.getPort()); + request.setServerPort(request.getLocalPort()); + try { + request.serverName().duplicate(request.localName()); + } catch (IOException e) { + response.setStatus(400); + error = true; + } return; } -- 2.11.0