You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/11/07 05:54:22 UTC
svn commit: r1032212 - in /trafficserver/traffic/trunk/proxy/http2:
HttpTunnel.cc HttpTunnel.h
Author: zwoop
Date: Sun Nov 7 04:54:22 2010
New Revision: 1032212
URL: http://svn.apache.org/viewvc?rev=1032212&view=rev
Log:
Undo some erronous inlining
Modified:
trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc
trafficserver/traffic/trunk/proxy/http2/HttpTunnel.h
Modified: trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc?rev=1032212&r1=1032211&r2=1032212&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc Sun Nov 7 04:54:22 2010
@@ -129,6 +129,13 @@ init_max_chunk_buf()
max_chunk_buf_len = snprintf(max_chunk_buf, sizeof(max_chunk_buf), "%x\r\n", max_chunk_size);
}
+ChunkedHandler::ChunkedHandler()
+ : chunked_reader(NULL), dechunked_buffer(NULL), dechunked_size(0), dechunked_reader(NULL), chunked_buffer(NULL),
+ chunked_size(0), truncation(false), skip_bytes(0), state(CHUNK_READ_CHUNK), cur_chunk_size(0),
+ bytes_left(0), last_server_event(VC_EVENT_NONE), running_sum(0), num_digits(0)
+{
+}
+
void
ChunkedHandler::init(IOBufferReader * buffer_in, HttpTunnelProducer * p)
{
@@ -433,6 +440,28 @@ bool ChunkedHandler::generate_chunked_co
#undef MIN
+HttpTunnelProducer::HttpTunnelProducer()
+ : consumer_list(), self_consumer(NULL),
+ vc(NULL), vc_handler(NULL), read_vio(NULL), read_buffer(NULL),
+ buffer_start(NULL), vc_type(HT_HTTP_SERVER), chunking_action(TCA_PASSTHRU_DECHUNKED_CONTENT),
+ do_chunking(false), do_dechunking(false), do_chunked_passthru(false),
+ init_bytes_done(0), nbytes(0), ntodo(0), bytes_read(0), handler_state(0), num_consumers(0), alive(false),
+ read_success(false), name(NULL)
+{
+}
+
+HttpTunnelConsumer::HttpTunnelConsumer()
+ : link(), producer(NULL), self_producer(NULL), vc_type(HT_HTTP_CLIENT), vc(NULL), buffer_reader(NULL),
+ vc_handler(NULL), write_vio(NULL), skip_bytes(0), bytes_written(0), handler_state(0), alive(false),
+ write_success(false), name(NULL)
+{
+}
+
+HttpTunnel::HttpTunnel()
+ : Continuation(NULL), num_producers(0), num_consumers(0), sm(NULL), active(false)
+{
+}
+
void
HttpTunnel::reset()
{
Modified: trafficserver/traffic/trunk/proxy/http2/HttpTunnel.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.h?rev=1032212&r1=1032211&r2=1032212&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTunnel.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTunnel.h Sun Nov 7 04:54:22 2010
@@ -122,11 +122,7 @@ struct ChunkedHandler
int running_sum;
int num_digits;
- ChunkedHandler()
- : chunked_reader(NULL), dechunked_buffer(NULL), dechunked_size(0), dechunked_reader(NULL), chunked_buffer(NULL),
- chunked_size(0), truncation(false), skip_bytes(0), state(CHUNK_READ_CHUNK), cur_chunk_size(0),
- bytes_left(0), last_server_event(VC_EVENT_NONE), running_sum(0), num_digits(0)
- { }
+ ChunkedHandler();
void init(IOBufferReader * buffer_in, HttpTunnelProducer * p);
@@ -143,11 +139,7 @@ private:
struct HttpTunnelConsumer
{
- HttpTunnelConsumer()
- : link(), producer(NULL), self_producer(NULL), vc_type(HT_HTTP_CLIENT), vc(NULL), buffer_reader(NULL),
- vc_handler(NULL), write_vio(NULL), skip_bytes(0), bytes_written(0), handler_state(0), alive(false),
- write_success(false), name(NULL)
- { }
+ HttpTunnelConsumer();
LINK(HttpTunnelConsumer, link);
HttpTunnelProducer *producer;
@@ -170,15 +162,7 @@ struct HttpTunnelConsumer
struct HttpTunnelProducer
{
- HttpTunnelProducer()
- : consumer_list(), self_consumer(NULL),
- vc(NULL), vc_handler(NULL), read_vio(NULL), read_buffer(NULL),
- buffer_start(NULL), vc_type(HT_HTTP_SERVER), chunking_action(TCA_PASSTHRU_DECHUNKED_CONTENT),
- do_chunking(false), do_dechunking(false), do_chunked_passthru(false),
- init_bytes_done(0), nbytes(0), ntodo(0), bytes_read(0), handler_state(0), num_consumers(0), alive(false),
- read_success(false), name(NULL)
- { }
-
+ HttpTunnelProducer();
DLL<HttpTunnelConsumer> consumer_list;
HttpTunnelConsumer *self_consumer;
@@ -212,12 +196,10 @@ struct HttpTunnelProducer
class PostDataBuffers
{
public:
- PostDataBuffers():postdata_producer_buffer(NULL), postdata_copy_buffer(NULL), postdata_producer_reader(NULL),
- postdata_copy_buffer_start(NULL), ua_buffer_reader(NULL)
- {
- Debug("http_redirect", "[PostDataBuffers::PostDataBuffers]");
- }
-
+ PostDataBuffers()
+ : postdata_producer_buffer(NULL), postdata_copy_buffer(NULL), postdata_producer_reader(NULL),
+ postdata_copy_buffer_start(NULL), ua_buffer_reader(NULL)
+ { Debug("http_redirect", "[PostDataBuffers::PostDataBuffers]"); }
MIOBuffer *postdata_producer_buffer;
MIOBuffer *postdata_copy_buffer;
@@ -231,9 +213,7 @@ class HttpTunnel:public Continuation
friend class HttpPagesHandler;
friend class CoreUtils;
public:
- HttpTunnel()
- : Continuation(NULL), num_producers(0), num_consumers(0), sm(NULL), active(false)
- { }
+ HttpTunnel();
void init(HttpSM * sm_arg, ProxyMutex * amutex);
void reset();