[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/http/pub http_demux.h, 1.12,
From:       jgordon () helixcommunity ! org
Date:       2009-09-22 21:44:43
Message-ID: 200909222254.n8MMs1VY013091 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/protocol/http/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16438/server/protocol/http/pub


Modified Files:
	http_demux.h httpbaseproto.h 
Log Message:
Synopsis
========
cleans up some protocol specific handling in Client/ClientSession
Branches: HEAD (SERVER_CURRENT)
Reviewer: jzeng


Description
===========
Moves a bunch of per-protocol stuff from Client and ClientSession into
the protocols. Also adds counters for RTMP clients. And allows the
protocol to specify the appropriate payload type to tell the file
format.

Long file list, but really it's not all that big! Just small changes to
lots of files.

Files Affected
==============
server/engine/core/hxprot.cpp
server/engine/core/server_info.cpp
server/engine/core/pub/hxprot.h
server/engine/core/pub/server_info.h
server/engine/session/client.cpp
server/engine/session/clientsession.cpp
server/engine/session/pub/client.h
server/engine/session/pub/clientsession.h
server/include/hxservinfo.h
server/protocol/cloaked/cloak_common.cpp
server/protocol/http/http_demux.cpp
server/protocol/http/httpbaseproto.cpp
server/protocol/http/pub/http_demux.h
server/protocol/http/pub/httpbaseproto.h
server/protocol/rtsp/crtspbase.cpp
server/protocol/rtsp/pub/crtspbase.h
server-restricted/proxy/rproxy/rtspprxy.cpp
server_rn/protocol/flash/rtmpserv/rtmpserv.cpp
server_rn/protocol/flash/rtmpserv/pub/rtmpserv.h
server_rn/protocol/wmt/http/wmt_httpprot.cpp
server_rn/protocol/wmt/http/pub/wmt_httpprot.h
server_rn/protocol/wmt/servermms/mmsserv.cpp
server_rn/protocol/wmt/servermms/pub/mmsserv.h
server_rn/proxy/core/mmsproxy.cpp
server_rn/proxy/core/mmsproxy.h


Testing Performed
=================
Unit Tests:

Integration Tests:
Verified protocol types in access logs
Verified rss counts

Leak Tests:
None

Performance Tests:
None

Platforms Tested: linux-rhel5-i686
Build verified: linux-rhel4-i686, win32-i386-vc7


QA Hints
===============

n/a



Index: httpbaseproto.h
===================================================================
RCS file: /cvsroot/server/protocol/http/pub/httpbaseproto.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- httpbaseproto.h	30 Aug 2007 00:38:57 -0000	1.2
+++ httpbaseproto.h	22 Sep 2009 21:44:40 -0000	1.3
@@ -45,6 +45,7 @@
 class HTTPQoSTranAdaptInfo;
 class HTTPResponseMessage;
 enum StreamError;
+_INTERFACE IHXServerInfo;
 
 class HTTPBaseProtocol: public IHXHTTPDemuxResponse
 {
@@ -87,6 +88,9 @@
     virtual void                  Shutdown(HX_RESULT status) PURE;
 
 protected:
+    HXBOOL          m_bHTTPCountIncremented;
+    IHXServerInfo*  m_pServerInfo;
+
     class ShutdownCallback : public BaseCallback
     {
     public:
@@ -107,9 +111,6 @@
     void                    init_registry(Client* pClient, REF(char*) pRegistryKey);
     void                    init_request(HTTPMessage::Tag tag, const char* szURL, \
                Client* pClient, 
                                          IHXRegistry* hxReg, const char* \
                pRegistryKey, IHXValues* pRequestHeaders);
-
-    
-
 };
 
 #endif  /* _HTTPBASEPROT_H_ */

Index: http_demux.h
===================================================================
RCS file: /cvsroot/server/protocol/http/pub/http_demux.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- http_demux.h	6 Jun 2009 12:11:48 -0000	1.12
+++ http_demux.h	22 Sep 2009 21:44:40 -0000	1.13
@@ -163,8 +163,8 @@
     STDMETHOD_(void, SetHTTPResponseCode)(THIS_ UINT16 code);
 
     // HXProtocol
-    virtual void                init(Process* proc, IHXSocket* pSock);
-    virtual const char*         versionStr(void) { return "HTTP/1.0"; }
+    virtual void init(Process* proc, IHXSocket* pSock);
+    virtual void GetProtocolName(IHXBuffer*& pName, IHXBuffer*& pVersion);
 
     // CHTTPDemux
     void Shutdown(HX_RESULT status);


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]