You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/02/12 05:41:45 UTC
svn commit: r909230 - in
/incubator/trafficserver/traffic/trunk/proxy/http2/remap: RemapProcessor.cc
UrlRewrite.cc
Author: zwoop
Date: Fri Feb 12 04:41:44 2010
New Revision: 909230
URL: http://svn.apache.org/viewvc?rev=909230&view=rev
Log:
TS-175: TS always sends port string 80 in Host header to OS irrespective of remap.config
Author: Manjesh Nilange
Review: Leif
Modified:
incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc
incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc?rev=909230&r1=909229&r2=909230&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc Fri Feb 12 04:41:44 2010
@@ -260,7 +260,7 @@
((rewrite_table->pristine_host_hdr <= 0 && s->pristine_host_hdr <= 0) ||
(rewrite_table->pristine_host_hdr > 0 && s->pristine_host_hdr == 0))) {
remapped_host = request_url->host_get(&remapped_host_len);
- remapped_port = request_url->port_get();
+ remapped_port = request_url->port_get_raw();
// Debug code to print out old host header. This was easier before
// the header conversion. Now we have to copy to gain null
@@ -283,7 +283,9 @@
if (host_buf_len > remapped_host_len) {
tmp = remapped_host_len;
memcpy(host_hdr_buf, remapped_host, remapped_host_len);
- tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1, ":%d", remapped_port);
+ if (remapped_port) {
+ tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1, ":%d", remapped_port);
+ }
} else {
tmp = host_buf_len;
}
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc?rev=909230&r1=909229&r2=909230&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc Fri Feb 12 04:41:44 2010
@@ -1264,7 +1264,7 @@
((pristine_host_hdr <= 0 && s->pristine_host_hdr <= 0) ||
(pristine_host_hdr > 0 && s->pristine_host_hdr == 0))) {
remapped_host = request_url->host_get(&remapped_host_len);
- remapped_port = request_url->port_get();
+ remapped_port = request_url->port_get_raw();
// Debug code to print out old host header. This was easier before
// the header conversion. Now we have to copy to gain null
@@ -1288,8 +1288,10 @@
if (host_buf_len > remapped_host_len) {
tmp = remapped_host_len;
memcpy(host_hdr_buf, remapped_host, remapped_host_len);
- tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1,
- ":%d", remapped_port);
+ if (remapped_port) {
+ tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1,
+ ":%d", remapped_port);
+ }
} else {
tmp = host_buf_len;
}