trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject git commit: This is not a backport, as it is 3.0.x specific! [TS-1095] 3.0.x ts.h.in has incorrect declaration for TSFetchURL 3.0.x patch: https://issues.apache.org/jira/secure/attachment/12512272/ts.h.in.patch Review: briang, zwoop, igalic Backport: iga
Date Thu, 02 Feb 2012 22:06:30 GMT
Updated Branches:
  refs/heads/3.0.x 953fce77a -> 83b24117e


This is not a backport, as it is 3.0.x specific!
[TS-1095] 3.0.x ts.h.in has incorrect declaration for TSFetchURL
3.0.x patch: https://issues.apache.org/jira/secure/attachment/12512272/ts.h.in.patch
Review: briang, zwoop, igalic
Backport: igalic


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

Branch: refs/heads/3.0.x
Commit: 83b24117e6e4aa9b428c2302a17bcd5aaa4231b6
Parents: 953fce7
Author: Igor Galić <igalic@apache.org>
Authored: Thu Feb 2 23:03:35 2012 +0100
Committer: Igor Galić <igalic@apache.org>
Committed: Thu Feb 2 23:03:35 2012 +0100

----------------------------------------------------------------------
 CHANGES              |    2 ++
 STATUS               |    6 ------
 proxy/api/ts/ts.h.in |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/83b24117/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a735c5f..c85ae6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.0.3
+  *) [TS-1095] ts.h.in has incorrect declaration for TSFetchURL
+
   *) [TS-1014] slow log can not print logs well on 32-bit system,
   changed the %d to RPI64. Author: weijin.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/83b24117/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index b3b0ad7..8930d33 100644
--- a/STATUS
+++ b/STATUS
@@ -40,12 +40,6 @@ A list of all bugs open for the next v3.0.2 release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) 3.0.x ts.h.in has incorrect declaration for TSFetchURL
-   Trunk patch: (patch only applies to 3.0.x, see JIRA)
-   3.0.x patch: https://issues.apache.org/jira/secure/attachment/12512272/ts.h.in.patch
-   Jira: https://issues.apache.org/jira/browse/TS-1095
-   +1: briang, zwoop, igalic
-
   *) TSHttpTxnErrorBodySet() can still leak memory.
    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1228991
    Jira: https://issues.apache.org/jira/browse/TS-1038

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/83b24117/proxy/api/ts/ts.h.in
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in
index df49660..49d384b 100644
--- a/proxy/api/ts/ts.h.in
+++ b/proxy/api/ts/ts.h.in
@@ -2320,7 +2320,7 @@ extern "C"
       
    */
   tsapi TSVConn TSHttpConnect(struct sockaddr const* addr);
-  tsapi void TSFetchUrl(const char* request,int request_len, struct sockaddr const* addr,
TSCont contp, TSFetchWakeUpOptions callback_options,TSFetchEvent event);
+  tsapi void TSFetchUrl(const char* headers, int request_len, unsigned int ip, int port ,
TSCont contp, TSFetchWakeUpOptions callback_options,TSFetchEvent events);
   tsapi void TSFetchPages(TSFetchUrlParams_t* params);
 
   /* Check if HTTP State machine is internal or not */


Mime
View raw message