You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/02/09 15:50:01 UTC

git commit: backport r1236880 / 5ea619b2a10d22f3d17ea70fb5c7bb5bac954eea TS-1066 TSHttpTxnServerReqHdrBytesGet in InkAPI.cc has an extra parameter (int *bytes) from the prototype in . Author: Alistair Stevenson review: zwoop, igalic, niq backpor

Updated Branches:
  refs/heads/3.0.x b08aece9f -> b45fa57fd


backport r1236880 / 5ea619b2a10d22f3d17ea70fb5c7bb5bac954eea
TS-1066 TSHttpTxnServerReqHdrBytesGet in InkAPI.cc has an extra
parameter (int *bytes) from the prototype in <ts/ts.h>.
Author: Alistair Stevenson
review: zwoop, igalic, niq
backport: igalic


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

Branch: refs/heads/3.0.x
Commit: b45fa57fdde25a1519c1f15383937f4ba276e74c
Parents: b08aece
Author: Igor Galić <i....@brainsware.org>
Authored: Thu Feb 9 14:54:23 2012 +0000
Committer: Igor Galić <i....@brainsware.org>
Committed: Thu Feb 9 14:54:23 2012 +0000

----------------------------------------------------------------------
 CHANGES         |    4 ++++
 STATUS          |    5 -----
 proxy/InkAPI.cc |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b45fa57f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 24039ac..cd6195a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,10 @@ Changes with Apache Traffic Server 3.0.3
   *) [TS-1055]: Wrong implementation of TSHttpSsnArgGet().
     Author: Yakov Kopel
 
+  *) [TS-1066] TSHttpTxnServerReqHdrBytesGet in InkAPI.cc has an extra
+   parameter (int *bytes) from the prototype in <ts/ts.h>.
+   Author: Alistair Stevenson
+
   *) [TS-874] make asf-dist work with git repo
 
   *) [TS-1038] SHttpTxnErrorBodySet() can leak memory.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b45fa57f/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 01b8971..3de4b76 100644
--- a/STATUS
+++ b/STATUS
@@ -40,11 +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:
 
-  *) API: TSHttpTxnServerReqHdrBytesGet in InkAPI.cc has an extra param.
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1236880
-   Jira: https://issues.apache.org/jira/browse/TS-1061
-   +1: zwoop, igalic, niq
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b45fa57f/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 052250d..b5913a1 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -5590,7 +5590,7 @@ TSHttpTxnClientReqBodyBytesGet(TSHttpTxn txnp)
 }
 
 int
-TSHttpTxnServerReqHdrBytesGet(TSHttpTxn txnp, int *bytes)
+TSHttpTxnServerReqHdrBytesGet(TSHttpTxn txnp)
 {
   sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);