disable_webdav_3.2.patch

来自「konqueror3 embedded版本, KDE环境下的当家浏览器的嵌入式版」· PATCH 代码 · 共 184 行

--- http.cc.orig	2004-05-20 10:58:01.065776503 +0200
+++ http.cc	2004-05-20 10:58:01.471724285 +0200
@@ -584,9 +584,12 @@ void HTTPProtocol::stat(const KURL& url)
     return;
   }
 
+#if !defined(QT_NO_DOM)
   davStatList( url );
+#endif
 }
 
+#if !defined(QT_NO_DOM)
 void HTTPProtocol::listDir( const KURL& url )
 {
   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::listDir " << url.url()
@@ -762,6 +765,7 @@ void HTTPProtocol::davGeneric( const KUR
 
   retrieveContent( false );
 }
+#endif
 
 int HTTPProtocol::codeFromResponse( const QString& response )
 {
@@ -770,6 +774,7 @@ int HTTPProtocol::codeFromResponse( cons
   return response.mid( firstSpace + 1, secondSpace - firstSpace - 1 ).toInt();
 }
 
+#if !defined(QT_NO_DOM)
 void HTTPProtocol::davParsePropstats( const QDomNodeList& propstats, UDSEntry& entry )
 {
   QString mimeType;
@@ -1010,6 +1015,7 @@ void HTTPProtocol::davParseActiveLocks( 
     }
   }
 }
+#endif
 
 long HTTPProtocol::parseDateTime( const QString& input, const QString& type )
 {
@@ -1030,6 +1036,7 @@ long HTTPProtocol::parseDateTime( const 
   return KRFCDate::parseDateISO8601( input );
 }
 
+#if !defined(QT_NO_DOM)
 QString HTTPProtocol::davProcessLocks()
 {
   if ( hasMetaData( "davLockCount" ) )
@@ -1162,6 +1169,7 @@ void HTTPProtocol::mkdir( const KURL& ur
   else
     davError();
 }
+#endif
 
 void HTTPProtocol::get( const KURL& url )
 {
@@ -1218,6 +1226,7 @@ void HTTPProtocol::put( const KURL &url,
     httpError();
 }
 
+#if !defined(QT_NO_DOM)
 void HTTPProtocol::copy( const KURL& src, const KURL& dest, int, bool overwrite )
 {
   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::copy " << src.prettyURL()
@@ -1304,6 +1313,7 @@ void HTTPProtocol::del( const KURL& url,
   else
     davError();
 }
+#endif
 
 void HTTPProtocol::post( const KURL& url )
 {
@@ -1322,6 +1332,7 @@ void HTTPProtocol::post( const KURL& url
   retrieveContent();
 }
 
+#if !defined(QT_NO_DOM)
 void HTTPProtocol::davLock( const KURL& url, const QString& scope,
                             const QString& type, const QString& owner )
 {
@@ -1610,6 +1621,7 @@ QString HTTPProtocol::davError( int code
 
   return errorString;
 }
+#endif
 
 void HTTPProtocol::httpError()
 {
@@ -2124,6 +2136,7 @@ bool HTTPProtocol::httpOpen()
         header = "OPTIONS ";
         m_request.bCachedWrite = false; // Do not put any result in the cache
         break;
+#if !defined(QT_NO_DOM)
     case DAV_PROPFIND:
         header = "PROPFIND ";
         davData = true;
@@ -2201,6 +2214,7 @@ bool HTTPProtocol::httpOpen()
         header = "POLL ";
         m_request.bCachedWrite = false;
         break;
+#endif
     default:
         error (ERR_UNSUPPORTED_ACTION, QString::null);
         return false;
@@ -2398,7 +2412,7 @@ bool HTTPProtocol::httpOpen()
     // Do we need to authorize to the proxy server ?
     if ( m_state.doProxy && !m_bIsTunneled )
       header += proxyAuthenticationHeader();
-
+#if !defined(QT_NO_DOM)
     if ( m_protocol == "webdav" || m_protocol == "webdavs" )
     {
       header += davProcessLocks();
@@ -2416,6 +2430,7 @@ bool HTTPProtocol::httpOpen()
       if ( !davHeader.isNull() )
         header += davHeader;
     }
+#endif
   }
 
   kdDebug(7103) << "(" << m_pid << ") ============ Sending Header:" << endl;
@@ -3187,6 +3202,7 @@ bool HTTPProtocol::readHeader()
         m_sContentMD5 = QString::fromLatin1(trimLead(buf + 12));
       }
 
+#if !defined(QT_NO_DOM)
       // *** Responses to the HTTP OPTIONS method follow
       // WebDAV capabilities
       else if (strncasecmp(buf, "DAV:", 4) == 0) {
@@ -3197,6 +3213,7 @@ bool HTTPProtocol::readHeader()
           m_davCapabilities << QString::fromLatin1(trimLead(buf + 4));
         }
       }
+#endif
       // *** Responses to the HTTP OPTIONS method finished
     }
     else if ((httpRev == HTTP_None) && (strlen(buf) != 0))
@@ -3836,6 +3853,7 @@ void HTTPProtocol::special( const QByteA
       cacheUpdate( url, no_cache, expireDate );
       break;
     }
+#if !defined(QT_NO_DOM)
     case 5: // WebDAV lock
     {
       KURL url;
@@ -3859,6 +3877,7 @@ void HTTPProtocol::special( const QByteA
       davGeneric( url, (KIO::HTTP_METHOD) method );
       break;
     }
+#endif
     case 99: // Close Connection
     {
       httpCloseConnection();
@@ -4062,10 +4081,12 @@ void HTTPProtocol::slotData(const QByteA
    }
    else
    {
+#if !defined(QT_NO_DOM)
       uint old_size = m_bufWebDavData.size();
       m_bufWebDavData.resize (old_size + m_bufReceive.size());
       memcpy (m_bufWebDavData.data() + old_size, m_bufReceive.data(),
               m_bufReceive.size());
+#endif
    }
 }
 
--- /home/lmonta/kde/kdelibs-32/kioslave/http/http.h	2004-01-18 17:15:17.000000000 +0100
+++ http.h	2004-05-26 10:57:04.247637776 +0200
@@ -193,6 +193,7 @@ public:
   virtual void put( const KURL& url, int _mode, bool _overwrite,
                     bool _resume );
 
+#ifndef QT_NO_DOM
 //----------------- Re-implemented methods for WebDAV -----------
   virtual void listDir( const KURL& url );
   virtual void mkdir( const KURL& url, int _permissions );
@@ -218,6 +219,7 @@ public:
   // Handle error conditions
   QString davError( int code = -1, QString url = QString::null );
 //---------------------------- End WebDAV -----------------------
+#endif
 
   /**
    * Special commands supported by this slave :