git commit: TS-2463: Crash regression around slow-log feature

[igalic]

Updated Branches:
  refs/heads/4.1.x 1de3269d8 -> d738e3985


TS-2463: Crash regression around slow-log feature

This happens when logging a slow event, and fixes commit c290ce0df2a.

Conflicts:
        CHANGES


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d738e398
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d738e398
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d738e398

Branch: refs/heads/4.1.x
Commit: d738e39852ca9e6a84dd052e702bc7b2d06d8eb8
Parents: 1de3269
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Dec 31 11:01:39 2013 -0700
Committer: Igor Galić <i.ga...@brainsware.org>
Committed: Tue Jan 21 14:45:18 2014 +0100

----------------------------------------------------------------------
 CHANGES              | 4 ++++
 proxy/hdrs/HTTP.cc   | 9 +++++++--
 proxy/http/HttpSM.cc | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d738e398/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4f5d1ad..0f2ca20 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,14 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 4.1.3
 
+<<<<<<< HEAD
   *) [TS-2497] Failed post results in tunnel buffers being returned to
    freelist prematurely.
    Reporter: Thomas Jackson <thjac...@linkedin.com>
 
+  *) [TS-2463] Crash regression around slow-log feature, when logging an
+   event. This fixes commit c290ce0df2a.
+
 Changes with Apache Traffic Server 4.1.2
 
   *) [TS-2351] Bandaid fix for Range request crash related to

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d738e398/proxy/hdrs/HTTP.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index 6ecaf35..b9b8dc6 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -1576,7 +1576,8 @@ class UrlPrintHack {
 };
 
 char*
-HTTPHdr::url_string_get(Arena* arena, int* length) {
+HTTPHdr::url_string_get(Arena* arena, int* length)
+{
   char* zret = 0;
   UrlPrintHack hack(this);
 
@@ -1594,7 +1595,11 @@ HTTPHdr::url_string_get(Arena* arena, int* length) {
 }
 
 int
-HTTPHdr::url_print(char* buff, int length, int* offset, int* skip) {
+HTTPHdr::url_print(char* buff, int length, int* offset, int* skip)
+{
+  ink_release_assert(offset);
+  ink_release_assert(skip);
+
   int zret = 0;
   UrlPrintHack hack(this);
   if (hack.is_valid()) {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d738e398/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 243fc6b..401a61f 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -6594,8 +6594,10 @@ HttpSM::update_stats()
       ink_hrtime_from_msec(t_state.http_config_param->slow_log_threshold) < 
total_time) {
     URL* url = t_state.hdr_info.client_request.url_get();
     char url_string[256] = "";
+    int offset = 0;
+    int skip = 0;
 
-    t_state.hdr_info.client_request.url_print(url_string, sizeof url_string, 
0, 0);
+    t_state.hdr_info.client_request.url_print(url_string, sizeof url_string, 
&offset, &skip);
 
     // unique id
     char unique_id_string[128] = "";