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

List:       helix-server-cvs
Subject:    [Server-cvs] fs/sdpgenfsys sdpgenfobj.cpp,1.7.8.3,1.7.8.3.4.1
From:       jgordon () helixcommunity ! org
Date:       2008-11-20 21:15:25
Message-ID: 200811202123.mAKLNMVW009465 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/fs/sdpgenfsys
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv13046

Modified Files:
      Tag: SERVER_12_0
	sdpgenfobj.cpp 
Log Message:
Synopsis
========
Low impact (sdpgen only) work-around for the sdpgen related URL-
parsing issues, PRs 228137 and 231817

Branches: SERVER_12_0
Reviewer: dcollins


Description
===========
There are some URL parsing problems that occur with URL params that
resemble URLs (which usually only happens when sdpgen is used from a
browser that adds x-wap-profile headers).

This work-around is intended for 12.0 in order to minimize QA impact,
as the change is isolated to sdpgen; we simply will not add the
x-wap-profile as an URL param. We don't even know of any handsets
where it is actually beneficial anyway.

Files Affected
==============
server/fs/sdpgenfsys/sdpgenfobj.cpp


Index: sdpgenfobj.cpp
===================================================================
RCS file: /cvsroot/server/fs/sdpgenfsys/sdpgenfobj.cpp,v
retrieving revision 1.7.8.3
retrieving revision 1.7.8.3.4.1
diff -u -d -r1.7.8.3 -r1.7.8.3.4.1
--- sdpgenfobj.cpp	7 Mar 2008 06:14:48 -0000	1.7.8.3
+++ sdpgenfobj.cpp	20 Nov 2008 21:15:21 -0000	1.7.8.3.4.1
@@ -1031,12 +1031,14 @@
 
     // Look for x-wap-profile and x-wap-profile-diff so we can add them
     // to the query params
+#ifdef SDPGEN_XWAP_PROFILE
     if (SUCCEEDED(m_pRequest->GetRequestHeaders(pReqHeaders)) && pReqHeaders)
     {
         pReqHeaders->GetPropertyCString(zm_pszProfileProp, pXWapProfile);
         pReqHeaders->GetPropertyCString(zm_pszPrfDiffProp, pXWapPrfDiff);
     }
     HX_RELEASE(pReqHeaders);
+#endif /* SDPGEN_XWAP_PROFILE */
 
     // Look for query params
     pszQueryParams = strchr((char*)pReqUrl, '?');
@@ -1067,6 +1069,7 @@
             ulParamLen = ulReqUrlLen - ulNewReqUrlLen;
             ulReqUrlLen = ulNewReqUrlLen;
         }
+#ifdef SDPGEN_XWAP_PROFILE
         if (pXWapProfile)
         {
             ulPrfNameLen = strlen(zm_pszProfileParamName);
@@ -1087,6 +1090,7 @@
             // +2 for '=' and '&' or '?'
             ulParamLen += 3 * ulDiffLen + ulDiffNameLen + 2;
         }
+#endif /* SDPGEN_XWAP_PROFILE */
 
         // This is at least big enough
         rc = pQueryParamsBuf->SetSize(ulParamLen + 1);
@@ -1147,6 +1151,7 @@
             }
         }
 
+#ifdef SDPGEN_XWAP_PROFILE
         // add the x-wap-profile request
         if (pPrfBuf)
         {
@@ -1164,6 +1169,7 @@
                 ulDiffLen);
             bParamsEmpty = FALSE;
         }
+#endif /* SDPGEN_XWAP_PROFILE */
 
         if (!bParamsEmpty)
         {


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