You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/04/28 23:32:12 UTC
[5/6] git commit: TS-2746: rename SpdyAcceptCont to SpdySessionAccept
TS-2746: rename SpdyAcceptCont to SpdySessionAccept
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5ec5921b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5ec5921b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5ec5921b
Branch: refs/heads/master
Commit: 5ec5921b180e31c478892f2879d780f40979ebe8
Parents: 0d988fd
Author: James Peach <jp...@apache.org>
Authored: Thu Apr 24 13:23:06 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Apr 28 14:19:21 2014 -0700
----------------------------------------------------------------------
proxy/http/HttpProxyServerMain.cc | 4 +--
proxy/spdy/Makefile.am | 4 +--
proxy/spdy/P_SpdyAcceptCont.h | 46 ---------------------------------
proxy/spdy/P_SpdySessionAccept.h | 46 +++++++++++++++++++++++++++++++++
proxy/spdy/SpdyAcceptCont.cc | 47 ----------------------------------
proxy/spdy/SpdySessionAccept.cc | 47 ++++++++++++++++++++++++++++++++++
6 files changed, 97 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5ec5921b/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 21e12ed..9c7b866 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -36,7 +36,7 @@
#include "Tokenizer.h"
#include "P_SSLNextProtocolAccept.h"
#include "P_ProtocolAcceptCont.h"
-#include "P_SpdyAcceptCont.h"
+#include "P_SpdySessionAccept.h"
HttpSessionAccept *plugin_http_accept = NULL;
HttpSessionAccept *plugin_http_transparent_accept = 0;
@@ -164,7 +164,7 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor& acceptor, HttpProxyPort& port, unsigned
}
HttpSessionAccept *http = NEW(new HttpSessionAccept(accept_opt));
- SpdyAcceptCont *spdy = NEW(new SpdyAcceptCont(http));
+ SpdySessionAccept *spdy = NEW(new SpdySessionAccept(http));
SSLNextProtocolAccept *ssl = NEW(new SSLNextProtocolAccept(http));
ProtocolAcceptCont *proto = NEW(new ProtocolAcceptCont());
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5ec5921b/proxy/spdy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/spdy/Makefile.am b/proxy/spdy/Makefile.am
index a85dc61..ddf336e 100644
--- a/proxy/spdy/Makefile.am
+++ b/proxy/spdy/Makefile.am
@@ -34,8 +34,8 @@ AM_CPPFLAGS = \
noinst_LIBRARIES = libspdy.a
libspdy_a_SOURCES = \
- P_SpdyAcceptCont.h \
- SpdyAcceptCont.cc
+ P_SpdySessionAccept.h \
+ SpdySessionAccept.cc
if BUILD_SPDY
libspdy_a_SOURCES += \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5ec5921b/proxy/spdy/P_SpdyAcceptCont.h
----------------------------------------------------------------------
diff --git a/proxy/spdy/P_SpdyAcceptCont.h b/proxy/spdy/P_SpdyAcceptCont.h
deleted file mode 100644
index f7a00ab..0000000
--- a/proxy/spdy/P_SpdyAcceptCont.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/** @file
-
- SpdyAcceptCont
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-#ifndef P_SpdyAcceptCont_H_
-#define P_SpdyAcceptCont_H_
-
-#include "P_Net.h"
-#include "P_EventSystem.h"
-#include "P_UnixNet.h"
-#include "I_IOBuffer.h"
-
-class SpdyAcceptCont: public SessionAccept
-{
-public:
- SpdyAcceptCont(Continuation *ep);
- ~SpdyAcceptCont() {}
-
-private:
- int mainEvent(int event, void *netvc);
- SpdyAcceptCont(const SpdyAcceptCont &); // disabled
- SpdyAcceptCont& operator =(const SpdyAcceptCont&); // disabled
-
- Continuation *endpoint;
-};
-
-#endif /* P_SpdyAcceptCont_H_ */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5ec5921b/proxy/spdy/P_SpdySessionAccept.h
----------------------------------------------------------------------
diff --git a/proxy/spdy/P_SpdySessionAccept.h b/proxy/spdy/P_SpdySessionAccept.h
new file mode 100644
index 0000000..960c771
--- /dev/null
+++ b/proxy/spdy/P_SpdySessionAccept.h
@@ -0,0 +1,46 @@
+/** @file
+
+ SpdySessionAccept
+
+ @section license License
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#ifndef P_SpdySessionAccept_H_
+#define P_SpdySessionAccept_H_
+
+#include "P_Net.h"
+#include "P_EventSystem.h"
+#include "P_UnixNet.h"
+#include "I_IOBuffer.h"
+
+class SpdySessionAccept: public SessionAccept
+{
+public:
+ SpdySessionAccept(Continuation *ep);
+ ~SpdySessionAccept() {}
+
+private:
+ int mainEvent(int event, void *netvc);
+ SpdySessionAccept(const SpdySessionAccept &); // disabled
+ SpdySessionAccept& operator =(const SpdySessionAccept&); // disabled
+
+ Continuation *endpoint;
+};
+
+#endif /* P_SpdySessionAccept_H_ */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5ec5921b/proxy/spdy/SpdyAcceptCont.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyAcceptCont.cc b/proxy/spdy/SpdyAcceptCont.cc
deleted file mode 100644
index 5f1aa3c..0000000
--- a/proxy/spdy/SpdyAcceptCont.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/** @file
-
- SpdyNetAccept
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-#include "P_SpdyAcceptCont.h"
-#if TS_HAS_SPDY
-#include "P_SpdySM.h"
-#endif
-
-SpdyAcceptCont::SpdyAcceptCont(Continuation *ep)
- : SessionAccept(new_ProxyMutex()), endpoint(ep)
-{
-#if TS_HAS_SPDY
- spdy_config_load();
-#endif
- SET_HANDLER(&SpdyAcceptCont::mainEvent);
-}
-
-int
-SpdyAcceptCont::mainEvent(int /* event */, void *netvc)
-{
-#if TS_HAS_SPDY
- spdy_sm_create((TSCont)netvc);
-#else
- (void)(netvc);
-#endif
- return 0;
-}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5ec5921b/proxy/spdy/SpdySessionAccept.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdySessionAccept.cc b/proxy/spdy/SpdySessionAccept.cc
new file mode 100644
index 0000000..601ad47
--- /dev/null
+++ b/proxy/spdy/SpdySessionAccept.cc
@@ -0,0 +1,47 @@
+/** @file
+
+ SpdyNetAccept
+
+ @section license License
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#include "P_SpdySessionAccept.h"
+#if TS_HAS_SPDY
+#include "P_SpdySM.h"
+#endif
+
+SpdySessionAccept::SpdySessionAccept(Continuation *ep)
+ : SessionAccept(new_ProxyMutex()), endpoint(ep)
+{
+#if TS_HAS_SPDY
+ spdy_config_load();
+#endif
+ SET_HANDLER(&SpdySessionAccept::mainEvent);
+}
+
+int
+SpdySessionAccept::mainEvent(int /* event */, void *netvc)
+{
+#if TS_HAS_SPDY
+ spdy_sm_create((TSCont)netvc);
+#else
+ (void)(netvc);
+#endif
+ return 0;
+}