Changeset 20659 in webkit

Timestamp:

Apr 2, 2007 11:22:54 AM (17 years ago)

Author:

spadma

Message:

2007-04-02 bujtas <​zbujtas@gmail.com>

Reviewed by Sachin.
DESC: implement client side accept header support
​http://bugs.webkit.org/show_bug.cgi?id=13256

• BrowserControl/src/BrCtl.cpp: (CBrCtl::SetParamL):
• ResourceLoader/inc/LoaderContainer.h: (CLoaderContainer::ClientAcceptHeaders):
• ResourceLoader/src/HttpTransaction.cpp: (CHttpTransaction::AddRequestHeadersL):
• ResourceLoader/src/LoaderContainer.cpp: (CLoaderContainer::~CLoaderContainer): (CLoaderContainer::SetClientAcceptHeadersL):

Location:

S60/trunk/WebKit

Files:

• BrowserControl/src/BrCtl.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• ResourceLoader/inc/LoaderContainer.h (modified) (2 diffs)
• ResourceLoader/src/HttpTransaction.cpp (modified) (1 diff)
• ResourceLoader/src/LoaderContainer.cpp (modified) (2 diffs)

S60/trunk/WebKit/BrowserControl/src/BrCtl.cpp

@@ -82 +82 @@
 #include <AknsDrawUtils.h>
 #include <EscapeUtils.h>
-
+#include "LoaderContainer.h"
 #ifdef  RD_BROWSER_WIDGETS
 #include "WidgetExtension.h"
@@ -1438 +1438 @@
 //
 EXPORT_C void CBrCtl::SetParamL(
-    TBrCtlDefs::TBrCtlParams /*aParam*/,
-    const TDesC& /*aValue*/ )
-    {
+    TBrCtlDefs::TBrCtlParams aParam,
+    const TDesC& aValue )
+    {
+    //
+    if (aParam == TBrCtlDefs::EParamsRequestHeaders)
+        {
+        CStaticObjectContainer::Instance().LoaderContainerL(*this).SetClientAcceptHeadersL(aValue);
+        }
     }
 

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2007-04-02  bujtas  <zbujtas@gmail.com>
+
+        Reviewed by Sachin.
+        DESC: implement client side accept header support 
+        http://bugs.webkit.org/show_bug.cgi?id=13256
+
+        * BrowserControl/src/BrCtl.cpp:
+        (CBrCtl::SetParamL):
+        * ResourceLoader/inc/LoaderContainer.h:
+        (CLoaderContainer::ClientAcceptHeaders):
+        * ResourceLoader/src/HttpTransaction.cpp:
+        (CHttpTransaction::AddRequestHeadersL):
+        * ResourceLoader/src/LoaderContainer.cpp:
+        (CLoaderContainer::~CLoaderContainer):
+        (CLoaderContainer::SetClientAcceptHeadersL):
+
+
 vbradley, reviewed by yongjun
  DESC: Fix cursor when browser is brought back from background and a

S60/trunk/WebKit/ResourceLoader/inc/LoaderContainer.h

@@ -183 +183 @@
 
         /**
+        * Set accept headers set by the client application
+        * @since 3.1
+        * @return
+        */
+        void SetClientAcceptHeadersL( const TPtrC& aAcceptHeaders );
+
+        /**
+        * return accept headers set by the client application
+        * @since 3.1
+        * @return
+        */
+        const RPointerArray<HBufC8>& ClientAcceptHeaders() const { return iClientAcceptHeaders; }
+
+        /**
         * Get load observer
         * @since 3.1
@@ -314 +328 @@
         //
         CHttpCacheManager*  iCache;          // owned
+        //
+        RPointerArray<HBufC8> iClientAcceptHeaders;
     };
 

S60/trunk/WebKit/ResourceLoader/src/HttpTransaction.cpp

@@ -838 +838 @@
     iTrans->PropertySet().RemoveProperty( connectionCallbackStr );
     iTrans->PropertySet().SetPropertyL( connectionCallbackStr, tokenVal );
+    
+    // add client request headers
+    CLoaderContainer* loaderContainer = static_cast<CLoaderContainer*>
+        (TWebCoreLoaderContainer::LoaderContainer());
+    const RPointerArray<HBufC8>& clientHeaders = loaderContainer->ClientAcceptHeaders();
+    int i=0;
+    // clientHeaders.Count()-1 for the double i++ to make sure that we 
+    // have both the key and the value string
+    while (i < clientHeaders.Count()-1)
+        {
+        TPtrC8 headerName = *(clientHeaders[i++]);
+        TPtrC8 headerValue = *(clientHeaders[i++]);
+        // header name
+        RStringF headerNameStr = stringPool.OpenFStringL(headerName);
+        CleanupClosePushL(headerNameStr);
+        
+        // date type
+        if (headerNameStr == stringPool.StringF(HTTP::EIfModifiedSince, RHTTPSession::GetTable()) ||
+            headerNameStr == stringPool.StringF(HTTP::EIfUnmodifiedSince, RHTTPSession::GetTable()))
+            {
+            TInternetDate date;
+            date.SetDateL(headerValue);
+            TDateTime modifyTime(date.DateTime());
+            hdr.SetFieldL(headerNameStr, modifyTime);
+            }
+        // string    
+        else     
+            {
+            RStringF headerValueStr = stringPool.OpenFStringL( headerValue ); 
+            CleanupClosePushL(headerValueStr);
+            
+            hdr.SetFieldL( headerNameStr, headerValueStr );
+            CleanupStack::PopAndDestroy(); // headerNameStr
+            }
+        //
+        CleanupStack::PopAndDestroy(); // headerNameStr
+        }
     }
 

S60/trunk/WebKit/ResourceLoader/src/LoaderContainer.cpp

@@ -131 +131 @@
     delete iDownloadObserver;
     iLoaderArray.Close();
+    iClientAcceptHeaders.ResetAndDestroy();
+    iClientAcceptHeaders.Close();
+
     }
 
@@ -463 +466 @@
     }
 
+// -----------------------------------------------------------------------------
+// CLoaderContainer::SetClientAcceptHeaders
+//
+// -----------------------------------------------------------------------------
+//
+void CLoaderContainer::SetClientAcceptHeadersL( const TPtrC& aAcceptHeaders )
+    {
+    // cleanup pervious accept headers
+    iClientAcceptHeaders.ResetAndDestroy();
+    
+    TInt startName = 0;
+    TInt endName = 0;
+    TInt startValue = 0;
+    TInt endValue = 0;
+    TInt consumed = 0;
+    TInt len = aAcceptHeaders.Length();    
+    
+    HBufC8* acceptHeaders = HBufC8::NewLC(aAcceptHeaders.Length());
+    acceptHeaders->Des().Copy(aAcceptHeaders);
+    while (consumed < len)
+        {
+        TPtrC8 ptr(acceptHeaders->Ptr() + consumed, len - consumed);
+        // find the headers separator first
+        endValue = ptr.Locate('\r');
+        if (endValue == 0)
+            {
+            // skip empty headers
+            consumed++;
+            continue;
+            }
+        if (endValue == KErrNotFound)
+            {
+            endValue = ptr.Length();
+            }
+        TPtrC8 header(ptr.Ptr(), endValue);
+        startName = 0;
+        endName = header.Locate(':');
+        if (endName <= 0)
+            {
+            // No separator in the header, or it is the first character
+            User::Leave(KErrArgument);
+            }
+        // Skip leading spaces in header value
+        for (startValue = endName + 1; startValue < endValue && header[startValue] == ' '; startValue++)
+            {
+            }
+        //    
+        TInt headerPos = startName;
+        TInt valuePos = startValue;
+        //
+        HBufC8* headerBuf = HBufC8::NewLC(endName);
+        HBufC8* valueBuf = HBufC8::NewLC(endValue-startValue);
+
+        headerBuf->Des().Copy(ptr.Left(endName));
+        valueBuf->Des().Copy(ptr.Mid(startValue, endValue - startValue));
+        
+        User::LeaveIfError(iClientAcceptHeaders.Append(headerBuf)); 
+        User::LeaveIfError(iClientAcceptHeaders.Append(valueBuf));
+        CleanupStack::Pop(2); // headerBuf, valueBuf   
+        consumed += (endValue + 1);
+        }
+    CleanupStack::PopAndDestroy(); // acceptHeaders
+    }
+    
 //  End of File