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

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/http httpprot.cpp,1.117,1.118
From:       dcollins () helixcommunity ! org
Date:       2011-02-13 23:22:11
Message-ID: 201102132322.p1DNM273018085 () mailer ! progressive-comp ! com
[Download RAW message or body]

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

Modified Files:
	httpprot.cpp 
Log Message:
Synopsis
========
Fixes a HTTP-related build-buster for Restricted, DNA and Plus server builds

Branches: HEAD
Suggested Reviewer: Chytanya (pending)


Description
===========

Some MPEG2/TS code was added to httpprot.cpp without surrounding it with
the HELIX_FEATURE_SERVER_MPEG2TS feature flag, breaking all builds where
this feature is not enabled.


Filek Affected
==============

server/protocol/http/httpprot.cpp


Testing Performed
=================

Unit Tests:
- N/A

Integration Tests:
- N/A

Leak Tests:
- N/A

Performance Tests:
- N/A

Platforms Tested: N/A
Builds Verified: linux-rhel5-x86

QA Hints
========
- Does not affect the Retail/Mobile server or proxy builds.



Index: httpprot.cpp
===================================================================
RCS file: /cvsroot/server/protocol/http/httpprot.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- httpprot.cpp	4 Feb 2011 03:46:25 -0000	1.117
+++ httpprot.cpp	13 Feb 2011 23:22:09 -0000	1.118
@@ -2265,6 +2265,7 @@
     hxreg = new HXRegistry(pClient->m_pProc->pc->registry, pClient->m_pProc);
     hxreg->AddRef();
 
+#ifdef HELIX_FEATURE_SERVER_MPEG2TS
     m_bIsM3ugenReq = IsM3ugenReq();
 
     if (m_bIsM3ugenReq && !CheckForSecurePlaylist())
@@ -2272,6 +2273,7 @@
         hxreg->Release();
         return -1;
     }
+#endif
 
     HTTPBaseProtocol::init_request(pMsg->tag(), url.full, pClient, 
                                    hxreg, m_pRegistryKey, m_pRequestHeaders);
@@ -2368,6 +2370,7 @@
     return 0;
 }
 
+#ifdef HELIX_FEATURE_SERVER_MPEG2TS
 HXBOOL
 HTTPProtocol::IsM3ugenReq()
 {
@@ -2405,6 +2408,7 @@
 
     return bIPhoneReq;
 }
+#endif
 
 
 HX_RESULT


_______________________________________________
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]