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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/ecma
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-11-12 3:31:56
Message-ID: 20101112033156.8EF4FAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195838 by orlovich:

A couple of fixes/improvements for XHR:
- Support custom request types (#122069)
- Support the weirdo x-user-defined "encoding" which basically acts as a binary mode.

With both of these fixes, we can boot up the WebODF demo and view some of the simpler \
documents. Doesn't work entirely though  (one issue is a CSSOM one, but not sure if \
anything else is wrong)

BUG: 122069


 M  +72 -22    xmlhttprequest.cpp  
 M  +5 -1      xmlhttprequest.h  


--- trunk/KDE/kdelibs/khtml/ecma/xmlhttprequest.cpp #1195837:1195838
@@ -28,6 +28,7 @@
 #include "dom/dom_exception.h"
 #include "dom/dom_string.h"
 #include "misc/loader.h"
+#include "misc/translator.h"
 #include "html/html_documentimpl.h"
 #include "xml/dom2_eventsimpl.h"
 
@@ -40,12 +41,8 @@
 #include <QtCore/QHash>
 #include <kdebug.h>
 
-#ifdef APPLE_CHANGES
-#include "KWQLoader.h"
-#else
 #include <kio/netaccess.h>
 using KIO::NetAccess;
-#endif
 
 using namespace KJS;
 using namespace DOM;
@@ -317,6 +314,7 @@
     onReadyStateChangeListener(0),
     onLoadListener(0),
     decoder(0),
+    binaryMode(false),
     response(QString::fromLatin1("")),
     createdDocument(false),
     aborted(false)
@@ -327,7 +325,7 @@
 
 XMLHttpRequest::~XMLHttpRequest()
 {
-  if (job && method.toUpper() != QLatin1String("POST")) {
+  if (job && m_method != QLatin1String("POST")) {
         job->kill();
         job = 0;
   }
@@ -347,7 +345,7 @@
   // exist anymore. Match that, though being paranoid about post
   // (And don't emit any events w/o a doc, if we're kept alive otherwise).
   if (!doc) {
-    if (job && method.toUpper() != QLatin1String("POST")) {
+    if (job && m_method != QLatin1String("POST")) {
       job->kill();
       job = 0;
     }
@@ -406,6 +404,23 @@
   return false;
 }
 
+// Methods we're to recognize per the XHR spec (3.6.1, #3).
+// We map it to whether the method should be permitted or not (#4)
+static const IDTranslator<QByteArray, bool, const char*>::Info methodsTable[] = {
+    {"CONNECT", false},
+    {"DELETE", true}, 
+    {"GET", true},
+    {"HEAD", true},
+    {"OPTIONS", true},
+    {"POST", true},
+    {"PUT", true},
+    {"TRACE", false},
+    {"TRACK", false},
+    {0, false}
+};
+
+MAKE_TRANSLATOR(methodsLookup, QByteArray, bool, const char*, methodsTable)
+
 void XMLHttpRequest::open(const QString& _method, const KUrl& _url, bool _async, \
int& ec)  {
   abort();
@@ -423,7 +438,24 @@
     return;
   }
 
-  method = _method.toLower();
+  // ### potentially raise a SYNTAX_ERR 
+
+  // Lookup if the method is well-known, and if so check if it's OK
+  QByteArray methodNormalized = _method.toUpper().toUtf8();
+  if (methodsLookup()->hasLeft(methodNormalized)) {
+      if (methodsLookup()->toRight(methodNormalized)) {
+          // OK, replace with the canonical version...
+          m_method = _method.toUpper();
+      } else {
+          // Scary stuff like CONNECT
+          ec = DOMException::SECURITY_ERR;
+          return;
+      }
+  } else {
+      // Unknown -> pass through unchanged
+      m_method = _method;
+  }
+  
   url = _url;
   async = _async;
 
@@ -450,7 +482,9 @@
     return;
   }
 
-  if (method == "post") {
+  // We need to use a POST-like setup even for non-post whenever we 
+  // have a payload.
+  if (m_method == QLatin1String("POST") || !_body.isEmpty()) {
 
     // FIXME: determine post encoding correctly by looking in headers
     // for charset.
@@ -467,6 +501,9 @@
     job = KIO::get( url, KIO::NoReload, KIO::HideProgressInfo );
   }
 
+  // Regardless of job type, make sure the method is set
+  job->addMetaData("CustomHTTPMethod", m_method);
+
   if (!m_requestHeaders.isEmpty()) {
     QString rh;
     HTTPHeaderMap::ConstIterator begin = m_requestHeaders.constBegin();
@@ -534,15 +571,21 @@
 #endif
 }
 
+void XMLHttpRequest::clearDecoder()
+{
+    delete decoder;
+    decoder = 0;
+    binaryMode = false;
+}
+
 void XMLHttpRequest::abort()
 {
   if (job) {
     job->kill();
     job = 0;
   }
-  delete decoder;
-  decoder = 0;
   aborted = true;
+  clearDecoder();
   changeState(XHRS_Uninitialized);
 }
 
@@ -746,8 +789,7 @@
   job = 0;
   changeState(XHRS_Loaded);
 
-  delete decoder;
-  decoder = 0;
+  clearDecoder();
 }
 
 void XMLHttpRequest::slotRedirection(KIO::Job*, const KUrl& url)
@@ -792,7 +834,7 @@
   int len = (int)_data.size();
 #endif
 
-  if ( decoder == NULL ) {
+  if ( !decoder && !binaryMode ) {
     if (!m_mimeTypeOverride.isEmpty())
         encoding = encodingFromContentType(m_mimeTypeOverride);
 
@@ -806,20 +848,28 @@
       }
     }
 
+    if (encoding == QLatin1String("x-user-defined")) {
+      binaryMode = true;
+    } else {
     decoder = new KEncodingDetector;
-
     if (!encoding.isEmpty())
       decoder->setEncoding(encoding.toLatin1().constData(), \
KEncodingDetector::EncodingFromHTTPHeader);  else
       decoder->setEncoding("UTF-8", KEncodingDetector::DefaultEncoding);
   }
+  }
+  
   if (len == 0)
     return;
 
   if (len == -1)
     len = strlen(data);
 
-  QString decoded = decoder->decodeWithBuffering(data, len);
+  QString decoded;
+  if (binaryMode)
+    decoded = QString::fromLatin1(data, len);
+  else
+    decoded = decoder->decodeWithBuffering(data, len);
 
   response += decoded;
 
@@ -892,18 +942,17 @@
   case XMLHttpRequest::Send:
     {
       QString body;
-      if (args.size() >= 1) {
+      if (!args[0]->isUndefinedOrNull() 
+            // make sure we don't marshal "undefined" or such; 
+          && request->m_method != QLatin1String("GET") 
+          && request->m_method != QLatin1String("HEAD")) {
+            // ... or methods that don't have payload
+            
         DOM::NodeImpl* docNode = toNode(args[0]);
         if (docNode && docNode->isDocumentNode()) {
           DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl *>(docNode);
-
-          try {
             body = doc->toString().string();
             // FIXME: also need to set content type, including encoding!
-
-          } catch(DOM::DOMException&) {
-            return throwError(exec, GeneralError, "Exception serializing document");
-          }
         } else {
           body = args[0]->toString(exec).qstring();
         }
@@ -943,3 +992,4 @@
 } // end namespace
 
 #include "xmlhttprequest.moc"
+// kate: indent-width 2; replace-tabs on; tab-width 4; space-indent on;
--- trunk/KDE/kdelibs/khtml/ecma/xmlhttprequest.h #1195837:1195838
@@ -133,7 +133,7 @@
     QPointer<DOM::DocumentImpl> doc;
 
     KUrl url;
-    QString method;
+    QString m_method;
     bool async;
     HTTPHeaderMap m_requestHeaders;
     QString m_mimeTypeOverride;
@@ -146,6 +146,10 @@
     JSEventListener *onLoadListener;
 
     KEncodingDetector *decoder;
+    bool              binaryMode; // just byte-expand data,
+                                  // don't pass it through the decoder.
+    void clearDecoder();
+                                  
     QString encoding;
     QString responseHeaders;
 


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