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 2011/01/08 05:24:26 UTC
svn commit: r1056617 - in /trafficserver/traffic/tags/2.1.5: ./
proxy/http2/HttpTransact.cc proxy/http2/HttpTransactHeaders.cc
Author: zwoop
Date: Sat Jan 8 04:24:25 2011
New Revision: 1056617
URL: http://svn.apache.org/viewvc?rev=1056617&view=rev
Log:
Merge from trunk
Modified:
trafficserver/traffic/tags/2.1.5/ (props changed)
trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransact.cc
trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransactHeaders.cc
Propchange: trafficserver/traffic/tags/2.1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 8 04:24:25 2011
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
/trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1056566-1056567
+/trafficserver/traffic/trunk:1056566-1056567,1056608-1056609
Modified: trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransact.cc?rev=1056617&r1=1056616&r2=1056617&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransact.cc (original)
+++ trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransact.cc Sat Jan 8 04:24:25 2011
@@ -1301,8 +1301,9 @@ HttpTransact::HandleApiErrorJump(State*
generic HTTP/1.X 500 INKApi Error
**/
if ( s->http_return_code && s->http_return_code >= HTTP_STATUS_BAD_REQUEST ) {
+ const char *reason = http_hdr_reason_lookup(s->http_return_code);;
build_response(s, &s->hdr_info.client_response, s->client_info.http_version, s->http_return_code,
- http_hdr_reason_lookup(s->http_return_code)?:"Error" );
+ reason?reason:"Error" );
}
else {
build_response(s, &s->hdr_info.client_response, s->client_info.http_version,
Modified: trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransactHeaders.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransactHeaders.cc?rev=1056617&r1=1056616&r2=1056617&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransactHeaders.cc (original)
+++ trafficserver/traffic/tags/2.1.5/proxy/http2/HttpTransactHeaders.cc Sat Jan 8 04:24:25 2011
@@ -957,7 +957,7 @@ HttpTransactHeaders::insert_warning_head
else
warn_text_len = 0; // Make sure it's really zero
- char warning_text[bufsize];
+ char *warning_text = (char *)alloca(bufsize);
len = snprintf(warning_text, bufsize, "%3d %s %.*s", code, http_config_param->proxy_response_via_string, warn_text_len, warn_text);
header->value_set(MIME_FIELD_WARNING, MIME_LEN_WARNING, warning_text, len);