Changeset 33561 in webkit

Timestamp:

May 17, 2008 8:41:53 PM (16 years ago)

Author:

weinig@apple.com

Message:

2008-05-17 Sam Weinig <​sam@webkit.org>

Reviewed by Mark Rowe.

Re-factor core setRequestHeader logic into setRequestHeaderInternal.

• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::sameOriginRequest): (WebCore::XMLHttpRequest::setRequestHeader): (WebCore::XMLHttpRequest::setRequestHeaderInternal):
• xml/XMLHttpRequest.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• xml/XMLHttpRequest.cpp (modified) (2 diffs)
• xml/XMLHttpRequest.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-17  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Re-factor core setRequestHeader logic into setRequestHeaderInternal.
+
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::sameOriginRequest):
+        (WebCore::XMLHttpRequest::setRequestHeader):
+        (WebCore::XMLHttpRequest::setRequestHeaderInternal):
+        * xml/XMLHttpRequest.h:
+
 2008-05-17  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/xml/XMLHttpRequest.cpp

@@ -429 +429 @@
     request.setHTTPMethod(m_method);
 
-    if (!body.isNull() && m_method != "GET" && m_method != "HEAD" && (m_url.protocol().lower() == "http" || m_url.protocol().lower() == "https")) {
+    if (!body.isNull() && m_method != "GET" && m_method != "HEAD" && (m_url.protocolIs("http") || m_url.protocolIs("https"))) {
         String contentType = getRequestHeader("Content-Type");
         if (contentType.isEmpty()) {
-            ExceptionCode ec = 0;
 #if ENABLE(DASHBOARD_SUPPORT)
             Settings* settings = m_doc->settings();
             if (settings && settings->usesDashboardBackwardCompatibilityMode())
-                setRequestHeader("Content-Type", "application/x-www-form-urlencoded", ec);
+                setRequestHeaderInternal("Content-Type", "application/x-www-form-urlencoded");
             else
 #endif
-                setRequestHeader("Content-Type", "application/xml", ec);
-            ASSERT(ec == 0);
+                setRequestHeaderInternal("Content-Type", "application/xml");
         }
 
         // FIXME: must use xmlEncoding for documents.
         String charset = "UTF-8";
-      
+
         TextEncoding encoding(charset);
         if (!encoding.isValid()) // FIXME: report an error?
@@ -634 +632 @@
     }
 
+    setRequestHeaderInternal(name, value);
+}
+
+void XMLHttpRequest::setRequestHeaderInternal(const String& name, const String& value)
+{
     if (!m_requestHeaders.contains(name)) {
         m_requestHeaders.set(name, value);

trunk/WebCore/xml/XMLHttpRequest.h

@@ -109 +109 @@
 
     String getRequestHeader(const String& name) const;
+    void setRequestHeaderInternal(const String& name, const String& value);
 
     void changeState(XMLHttpRequestState newState);