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

List:       helix-filesystem-cvs
Subject:    [Filesystem-cvs] http httpfsys.h,1.61,1.61.2.1
From:       yijil () helixcommunity ! org
Date:       2012-07-10 9:29:23
[Download RAW message or body]

Update of /cvsroot/filesystem/http
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7129

Modified Files:
      Tag: SERVER_15_0
	httpfsys.h 
Log Message:
Merge code of version 1.60 and 1.61 in HEAD
update SERVER_15_0_RN


Index: httpfsys.h
===================================================================
RCS file: /cvsroot/filesystem/http/httpfsys.h,v
retrieving revision 1.61
retrieving revision 1.61.2.1
diff -u -d -r1.61 -r1.61.2.1
--- httpfsys.h	26 Jun 2012 16:06:06 -0000	1.61
+++ httpfsys.h	10 Jul 2012 09:29:20 -0000	1.61.2.1
@@ -455,7 +455,7 @@
      *  OpenURl() : open a new url
      *  Reset()   : clear variable to default value
      */
-    STDMETHOD(OpenURL) (THIS_ const char*  pURL, HXBOOL bReconnect);
+    STDMETHOD(OpenURL) (THIS_ const char*  pURL, IHXValues* pRequestHeaders, HXBOOL bReconnect);
     STDMETHOD(Reset) (THIS);
     
     HX_RESULT _ReOpen();
@@ -725,7 +725,7 @@
                                           const char*           pChunk,
                                           int                   l);
 
-    HX_RESULT	    ContainsMP3MimeType (const char* pData, UINT32 ulLength);
+    HXBOOL	    ContainsMP3MimeType (const char* pData, UINT32 ulLength);
 
     friend class HTTPFileObjCallback;
     friend class HTTPTCPResponse;
@@ -986,7 +986,10 @@
     ULONG32                     m_ulMaxBufSize ;
     HXBOOL                      m_bShoutcastSupportOnly;
     HXBOOL                      m_bReuseResolver;
-    HXBOOL                      m_bNoNeedLock;
+#ifdef HELIX_FEATURE_SERVER_DRM_VCAS
+    HXBOOL                      m_bUserDrmVCAS;
+#endif
+	HXBOOL                      m_bNoNeedLock;
     UINT32                      m_nHTTPMethod;
 };
 


_______________________________________________
Filesystem-cvs mailing list
Filesystem-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/filesystem-cvs
[prev in list] [next in list] [prev in thread] [next in thread]