Git commit 2a657b59466ad2104f86ff3bc6bc429a2a1f55c5 by Gregory Oestreicher.
Committed on 30/04/2011 at 22:25.
Pushed by goestreicher into branch 'master'.

Do not store cookies for HTTP jobs

BUG: 272074

M  +1    -0    resources/dav/common/davcollectiondeletejob.cpp     
M  +1    -0    resources/dav/common/davitemcreatejob.cpp     
M  +1    -0    resources/dav/common/davitemdeletejob.cpp     
M  +1    -0    resources/dav/common/davitemfetchjob.cpp     
M  +1    -0    resources/dav/common/davitemmodifyjob.cpp     
M  +5    -1    resources/dav/common/davmanager.cpp     
M  +3    -3    resources/dav/common/davprincipalhomesetsfetchjob.cpp     

http://commits.kde.org/kdepim-runtime/2a657b59466ad2104f86ff3bc6bc429a2a1f55c5

diff --git a/resources/dav/common/davcollectiondeletejob.cpp b/resources/dav/common/davcollectiondeletejob.cpp
index 01e75c8..1055f7b 100644
--- a/resources/dav/common/davcollectiondeletejob.cpp
+++ b/resources/dav/common/davcollectiondeletejob.cpp
@@ -30,6 +30,7 @@ void DavCollectionDeleteJob::start()
 {
   KIO::DeleteJob *job = KIO::del( mUrl.url(), KIO::HideProgressInfo | KIO::DefaultFlags );
   job->addMetaData( "PropagateHttpHeader", "true" );
+  job->addMetaData( "cookies", "none" );
 
   connect( job, SIGNAL( result( KJob* ) ), this, SLOT( davJobFinished( KJob* ) ) );
 }
diff --git a/resources/dav/common/davitemcreatejob.cpp b/resources/dav/common/davitemcreatejob.cpp
index b28e7df..4cc9862 100644
--- a/resources/dav/common/davitemcreatejob.cpp
+++ b/resources/dav/common/davitemcreatejob.cpp
@@ -55,6 +55,7 @@ void DavItemCreateJob::start()
   KIO::StoredTransferJob *job = KIO::storedPut( mItem.data(), mUrl.url(), -1, KIO::HideProgressInfo | KIO::DefaultFlags );
   job->addMetaData( "PropagateHttpHeader", "true" );
   job->addMetaData( "customHTTPHeader", headers );
+  job->addMetaData( "cookies", "none" );
 
   connect( job, SIGNAL( result( KJob* ) ), this, SLOT( davJobFinished( KJob* ) ) );
 }
diff --git a/resources/dav/common/davitemdeletejob.cpp b/resources/dav/common/davitemdeletejob.cpp
index fad6e78..ecb47a5 100644
--- a/resources/dav/common/davitemdeletejob.cpp
+++ b/resources/dav/common/davitemdeletejob.cpp
@@ -33,6 +33,7 @@ void DavItemDeleteJob::start()
   KIO::DeleteJob *job = KIO::del( mUrl.url(), KIO::HideProgressInfo | KIO::DefaultFlags );
   job->addMetaData( "PropagateHttpHeader", "true" );
   job->addMetaData( "customHTTPHeader", "If-Match: " + mItem.etag() );
+  job->addMetaData( "cookies", "none" );
 
   connect( job, SIGNAL( result( KJob* ) ), this, SLOT( davJobFinished( KJob* ) ) );
 }
diff --git a/resources/dav/common/davitemfetchjob.cpp b/resources/dav/common/davitemfetchjob.cpp
index faece30..19e6ea5 100644
--- a/resources/dav/common/davitemfetchjob.cpp
+++ b/resources/dav/common/davitemfetchjob.cpp
@@ -53,6 +53,7 @@ void DavItemFetchJob::start()
   // contains "Mozilla", some strange debug data is displayed in the shared calendars.
   // This kinda mess up the events parsing...
   job->addMetaData( "UserAgent", "KDE DAV groupware client" );
+  job->addMetaData( "cookies", "none" );
 
   connect( job, SIGNAL( result( KJob* ) ), this, SLOT( davJobFinished( KJob* ) ) );
 }
diff --git a/resources/dav/common/davitemmodifyjob.cpp b/resources/dav/common/davitemmodifyjob.cpp
index 845c39e..ea49223 100644
--- a/resources/dav/common/davitemmodifyjob.cpp
+++ b/resources/dav/common/davitemmodifyjob.cpp
@@ -52,6 +52,7 @@ void DavItemModifyJob::start()
   KIO::StoredTransferJob *job = KIO::storedPut( mItem.data(), mUrl.url(), -1, KIO::HideProgressInfo | KIO::DefaultFlags );
   job->addMetaData( "PropagateHttpHeader", "true" );
   job->addMetaData( "customHTTPHeader", headers );
+  job->addMetaData( "cookies", "none" );
 
   connect( job, SIGNAL( result( KJob* ) ), this, SLOT( davJobFinished( KJob* ) ) );
 }
diff --git a/resources/dav/common/davmanager.cpp b/resources/dav/common/davmanager.cpp
index 1f32612..f2f9c94 100644
--- a/resources/dav/common/davmanager.cpp
+++ b/resources/dav/common/davmanager.cpp
@@ -58,6 +58,7 @@ KIO::DavJob* DavManager::createPropFindJob( const KUrl &url, const QDomDocument
   // workaround needed, Depth: header doesn't seem to be correctly added
   const QString header = "Content-Type: text/xml\r\nDepth: " + davDepth;
   job->addMetaData( "customHTTPHeader", header );
+  job->addMetaData( "cookies", "none" );
   job->setProperty( "extraDavDepth", QVariant::fromValue( davDepth ) );
 
   return job;
@@ -71,6 +72,7 @@ KIO::DavJob* DavManager::createReportJob( const KUrl &url, const QDomDocument &d
   // workaround needed, Depth: header doesn't seem to be correctly added
   const QString header = "Content-Type: text/xml\r\nDepth: " + davDepth;
   job->addMetaData( "customHTTPHeader", header );
+  job->addMetaData( "cookies", "none" );
   job->setProperty( "extraDavDepth", QVariant::fromValue( davDepth ) );
 
   return job;
@@ -78,7 +80,9 @@ KIO::DavJob* DavManager::createReportJob( const KUrl &url, const QDomDocument &d
 
 KIO::DavJob* DavManager::createPropPatchJob( const KUrl &url, const QDomDocument &document ) const
 {
-  return KIO::davPropPatch( url, document, KIO::HideProgressInfo | KIO::DefaultFlags );
+  KIO::DavJob *job = KIO::davPropPatch( url, document, KIO::HideProgressInfo | KIO::DefaultFlags );
+  job->addMetaData( "cookies", "none" );
+  return job;
 }
 
 const DavProtocolBase* DavManager::davProtocol( DavUtils::Protocol protocol )
diff --git a/resources/dav/common/davprincipalhomesetsfetchjob.cpp b/resources/dav/common/davprincipalhomesetsfetchjob.cpp
index 6353c21..1138eb2 100644
--- a/resources/dav/common/davprincipalhomesetsfetchjob.cpp
+++ b/resources/dav/common/davprincipalhomesetsfetchjob.cpp
@@ -113,7 +113,7 @@ void DavPrincipalHomeSetsFetchJob::davJobFinished( KJob *job )
    *   </D:propstat>
    *  </D:response>
    * </D:multistatus>
-   * 
+   *
    * Or like this (if the homeset is defined):
    *
    *  <?xml version="1.0" encoding="utf-8" ?>
@@ -168,12 +168,12 @@ void DavPrincipalHomeSetsFetchJob::davJobFinished( KJob *job )
 
     if ( !homeSetElement.isNull() ) {
       QDomElement hrefElement = DavUtils::firstChildElementNS( homeSetElement, "DAV:", "href" );
-  
+
       while ( !hrefElement.isNull() ) {
         const QString href = hrefElement.text();
         if ( !mHomeSets.contains( href ) )
           mHomeSets << href;
-  
+
         hrefElement = DavUtils::nextSiblingElementNS( hrefElement, "DAV:", "href" );
       }
     }