You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2019/05/30 14:03:42 UTC
[trafficserver] 01/02: Rename files: ProxyTransaction &
ProxySession Rename files: Http1Transaction & Http1ServerSession
This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit bb814b004bfe9508b0ed81542549d44548b11de8
Author: Aaron Canary <ac...@oath.com>
AuthorDate: Mon May 20 11:29:06 2019 -0500
Rename files: ProxyTransaction & ProxySession
Rename files: Http1Transaction & Http1ServerSession
---
proxy/Makefile.am | 8 ++++----
proxy/{ProxyClientSession.cc => ProxySession.cc} | 2 +-
proxy/{ProxyClientSession.h => ProxySession.h} | 2 +-
proxy/{ProxyClientTransaction.cc => ProxyTransaction.cc} | 2 +-
proxy/{ProxyClientTransaction.h => ProxyTransaction.h} | 2 +-
proxy/http/Http1ClientSession.cc | 4 ++--
proxy/http/Http1ClientSession.h | 4 ++--
proxy/http/{HttpServerSession.cc => Http1ServerSession.cc} | 4 ++--
proxy/http/{HttpServerSession.h => Http1ServerSession.h} | 2 +-
proxy/http/{Http1ClientTransaction.cc => Http1Transaction.cc} | 4 ++--
proxy/http/{Http1ClientTransaction.h => Http1Transaction.h} | 4 ++--
proxy/http/HttpSM.cc | 4 ++--
proxy/http/HttpSM.h | 2 +-
proxy/http/HttpSessionManager.cc | 4 ++--
proxy/http/HttpSessionManager.h | 2 +-
proxy/http/HttpTransact.h | 2 +-
proxy/http/Makefile.am | 8 ++++----
proxy/http2/Http2ClientSession.h | 2 +-
proxy/http2/Http2Stream.h | 2 +-
src/traffic_server/InkAPI.cc | 4 ++--
src/traffic_server/traffic_server.cc | 2 +-
21 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 1965837..30afed7 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -59,10 +59,10 @@ libproxy_a_SOURCES = \
PluginVC.h \
ProtocolProbeSessionAccept.cc \
ProtocolProbeSessionAccept.h \
- ProxyClientSession.cc \
- ProxyClientSession.h \
- ProxyClientTransaction.cc \
- ProxyClientTransaction.h \
+ ProxySession.cc \
+ ProxySession.h \
+ ProxyTransaction.cc \
+ ProxyTransaction.h \
ReverseProxy.cc \
ReverseProxy.h \
StatPages.cc \
diff --git a/proxy/ProxyClientSession.cc b/proxy/ProxySession.cc
similarity index 99%
rename from proxy/ProxyClientSession.cc
rename to proxy/ProxySession.cc
index 214295a..a4c27c0 100644
--- a/proxy/ProxyClientSession.cc
+++ b/proxy/ProxySession.cc
@@ -23,7 +23,7 @@
#include "HttpConfig.h"
#include "HttpDebugNames.h"
-#include "ProxyClientSession.h"
+#include "ProxySession.h"
static int64_t next_cs_id = 0;
diff --git a/proxy/ProxyClientSession.h b/proxy/ProxySession.h
similarity index 99%
rename from proxy/ProxyClientSession.h
rename to proxy/ProxySession.h
index 7c6acf9..9fa3aa1 100644
--- a/proxy/ProxyClientSession.h
+++ b/proxy/ProxySession.h
@@ -29,7 +29,7 @@
#include <string_view>
#include "P_Net.h"
#include "InkAPIInternal.h"
-#include "http/HttpServerSession.h"
+#include "http/Http1ServerSession.h"
#include "IPAllow.h"
// Emit a debug message conditional on whether this particular client session
diff --git a/proxy/ProxyClientTransaction.cc b/proxy/ProxyTransaction.cc
similarity index 98%
rename from proxy/ProxyClientTransaction.cc
rename to proxy/ProxyTransaction.cc
index 71323a4..e2b00bb 100644
--- a/proxy/ProxyClientTransaction.cc
+++ b/proxy/ProxyTransaction.cc
@@ -22,7 +22,7 @@
*/
#include "http/HttpSM.h"
-#include "http/HttpServerSession.h"
+#include "http/Http1ServerSession.h"
#include "Plugin.h"
#define HttpTxnDebug(fmt, ...) SsnDebug(this, "http_txn", fmt, __VA_ARGS__)
diff --git a/proxy/ProxyClientTransaction.h b/proxy/ProxyTransaction.h
similarity index 99%
rename from proxy/ProxyClientTransaction.h
rename to proxy/ProxyTransaction.h
index c4ebfe0..675a61c 100644
--- a/proxy/ProxyClientTransaction.h
+++ b/proxy/ProxyTransaction.h
@@ -23,7 +23,7 @@
#pragma once
-#include "ProxyClientSession.h"
+#include "ProxySession.h"
#include <string_view>
class HttpSM;
diff --git a/proxy/http/Http1ClientSession.cc b/proxy/http/Http1ClientSession.cc
index f19784c..34e10a2 100644
--- a/proxy/http/Http1ClientSession.cc
+++ b/proxy/http/Http1ClientSession.cc
@@ -32,10 +32,10 @@
#include "tscore/ink_resolver.h"
#include "Http1ClientSession.h"
-#include "Http1ClientTransaction.h"
+#include "Http1Transaction.h"
#include "HttpSM.h"
#include "HttpDebugNames.h"
-#include "HttpServerSession.h"
+#include "Http1ServerSession.h"
#include "Plugin.h"
#define HttpSsnDebug(fmt, ...) SsnDebug(this, "http_cs", fmt, __VA_ARGS__)
diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h
index 84863aa..054638b 100644
--- a/proxy/http/Http1ClientSession.h
+++ b/proxy/http/Http1ClientSession.h
@@ -36,8 +36,8 @@
#include "HTTP.h"
#include "HttpConfig.h"
#include "IPAllow.h"
-#include "ProxyClientSession.h"
-#include "Http1ClientTransaction.h"
+#include "ProxySession.h"
+#include "Http1Transaction.h"
#ifdef USE_HTTP_DEBUG_LISTS
extern ink_mutex debug_cs_list_mutex;
diff --git a/proxy/http/HttpServerSession.cc b/proxy/http/Http1ServerSession.cc
similarity index 99%
rename from proxy/http/HttpServerSession.cc
rename to proxy/http/Http1ServerSession.cc
index da6717a..bf8c495 100644
--- a/proxy/http/HttpServerSession.cc
+++ b/proxy/http/Http1ServerSession.cc
@@ -23,7 +23,7 @@
/****************************************************************************
- HttpServerSession.cc
+ Http1ServerSession.cc
Description:
@@ -32,7 +32,7 @@
#include "tscore/BufferWriter.h"
#include "tscore/bwf_std_format.h"
#include "tscore/Allocator.h"
-#include "HttpServerSession.h"
+#include "Http1ServerSession.h"
#include "HttpSessionManager.h"
#include "HttpSM.h"
diff --git a/proxy/http/HttpServerSession.h b/proxy/http/Http1ServerSession.h
similarity index 99%
rename from proxy/http/HttpServerSession.h
rename to proxy/http/Http1ServerSession.h
index 9e4ffcc..068c536 100644
--- a/proxy/http/HttpServerSession.h
+++ b/proxy/http/Http1ServerSession.h
@@ -23,7 +23,7 @@
/****************************************************************************
- HttpServerSession.h
+ Http1ServerSession.h
Description:
diff --git a/proxy/http/Http1ClientTransaction.cc b/proxy/http/Http1Transaction.cc
similarity index 96%
rename from proxy/http/Http1ClientTransaction.cc
rename to proxy/http/Http1Transaction.cc
index 72e4918..8e5e7b2 100644
--- a/proxy/http/Http1ClientTransaction.cc
+++ b/proxy/http/Http1Transaction.cc
@@ -1,6 +1,6 @@
/** @file
- Http1ClientTransaction.cc - The Transaction class for Http1*
+ Http1Transaction.cc - The Transaction class for Http1*
@section license License
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Http1ClientTransaction.h"
+#include "Http1Transaction.h"
#include "Http1ClientSession.h"
#include "HttpSM.h"
diff --git a/proxy/http/Http1ClientTransaction.h b/proxy/http/Http1Transaction.h
similarity index 97%
rename from proxy/http/Http1ClientTransaction.h
rename to proxy/http/Http1Transaction.h
index c0dbab4..1ee628d 100644
--- a/proxy/http/Http1ClientTransaction.h
+++ b/proxy/http/Http1Transaction.h
@@ -1,6 +1,6 @@
/** @file
- Http1ClientTransaction.h - The Transaction class for Http1*
+ Http1Transaction.h - The Transaction class for Http1*
@section license License
@@ -23,7 +23,7 @@
#pragma once
-#include "../ProxyClientTransaction.h"
+#include "../ProxyTransaction.h"
class Continuation;
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index e276839..24fd71e 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -22,12 +22,12 @@
*/
-#include "../ProxyClientTransaction.h"
+#include "../ProxyTransaction.h"
#include "HttpSM.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
#include "ProxyConfig.h"
-#include "HttpServerSession.h"
+#include "Http1ServerSession.h"
#include "HttpDebugNames.h"
#include "HttpSessionManager.h"
#include "P_Cache.h"
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index ed1b140..10d5e4b 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -41,7 +41,7 @@
#include "UrlRewrite.h"
#include "HttpTunnel.h"
#include "InkAPIInternal.h"
-#include "../ProxyClientTransaction.h"
+#include "../ProxyTransaction.h"
#include "HdrUtils.h"
#include "tscore/History.h"
diff --git a/proxy/http/HttpSessionManager.cc b/proxy/http/HttpSessionManager.cc
index d95a79d..b95a8ea 100644
--- a/proxy/http/HttpSessionManager.cc
+++ b/proxy/http/HttpSessionManager.cc
@@ -31,8 +31,8 @@
****************************************************************************/
#include "HttpSessionManager.h"
-#include "../ProxyClientSession.h"
-#include "HttpServerSession.h"
+#include "../ProxySession.h"
+#include "Http1ServerSession.h"
#include "HttpSM.h"
#include "HttpDebugNames.h"
diff --git a/proxy/http/HttpSessionManager.h b/proxy/http/HttpSessionManager.h
index 4112e3b..2378494 100644
--- a/proxy/http/HttpSessionManager.h
+++ b/proxy/http/HttpSessionManager.h
@@ -33,7 +33,7 @@
#pragma once
#include "P_EventSystem.h"
-#include "HttpServerSession.h"
+#include "Http1ServerSession.h"
#include "tscore/IntrusiveHashMap.h"
class ProxyClientTransaction;
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index afa5f5b..4889da9 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -39,7 +39,7 @@
#include "RemapPluginInfo.h"
#include "UrlMapping.h"
#include "records/I_RecHttp.h"
-#include "ProxyClientSession.h"
+#include "ProxySession.h"
#define HTTP_RELEASE_ASSERT(X) ink_release_assert(X)
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 6f57332..7b5abd7 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -46,8 +46,8 @@ libhttp_a_SOURCES = \
HttpCacheSM.h \
Http1ClientSession.cc \
Http1ClientSession.h \
- Http1ClientTransaction.cc \
- Http1ClientTransaction.h \
+ Http1Transaction.cc \
+ Http1Transaction.h \
HttpConfig.cc \
HttpConfig.h \
HttpConnectionCount.cc \
@@ -60,8 +60,8 @@ libhttp_a_SOURCES = \
HttpProxyServerMain.h \
HttpSM.cc \
HttpSM.h \
- HttpServerSession.cc \
- HttpServerSession.h \
+ Http1ServerSession.cc \
+ Http1ServerSession.h \
HttpSessionManager.cc \
HttpSessionManager.h \
HttpTransact.cc \
diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h
index b6d1fae..ed7f017 100644
--- a/proxy/http2/Http2ClientSession.h
+++ b/proxy/http2/Http2ClientSession.h
@@ -25,7 +25,7 @@
#include "HTTP2.h"
#include "Plugin.h"
-#include "ProxyClientSession.h"
+#include "ProxySession.h"
#include "Http2ConnectionState.h"
#include <string_view>
#include "tscore/ink_inet.h"
diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h
index 25df6b5..f69b9b6 100644
--- a/proxy/http2/Http2Stream.h
+++ b/proxy/http2/Http2Stream.h
@@ -24,7 +24,7 @@
#pragma once
#include "HTTP2.h"
-#include "../ProxyClientTransaction.h"
+#include "../ProxyTransaction.h"
#include "Http2DebugNames.h"
#include "../http/HttpTunnel.h" // To get ChunkedHandler
#include "Http2DependencyTree.h"
diff --git a/src/traffic_server/InkAPI.cc b/src/traffic_server/InkAPI.cc
index bb211a2..45c53e0 100644
--- a/src/traffic_server/InkAPI.cc
+++ b/src/traffic_server/InkAPI.cc
@@ -37,9 +37,9 @@
#include "URL.h"
#include "MIME.h"
#include "HTTP.h"
-#include "ProxyClientSession.h"
+#include "ProxySession.h"
#include "Http2ClientSession.h"
-#include "HttpServerSession.h"
+#include "Http1ServerSession.h"
#include "HttpSM.h"
#include "HttpConfig.h"
#include "P_Net.h"
diff --git a/src/traffic_server/traffic_server.cc b/src/traffic_server/traffic_server.cc
index c427cf9..48ac340 100644
--- a/src/traffic_server/traffic_server.cc
+++ b/src/traffic_server/traffic_server.cc
@@ -76,7 +76,7 @@ extern "C" int plock(int);
#include "ProxyConfig.h"
#include "HttpProxyServerMain.h"
#include "HttpBodyFactory.h"
-#include "ProxyClientSession.h"
+#include "ProxySession.h"
#include "logging/Log.h"
#include "CacheControl.h"
#include "IPAllow.h"