[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-287-g36337d0

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  36337d07ecfcaa04321cfac40398ebac54accb18 (commit)
       via  d4838ace89946d4bdea9bbe6b2a4e5d5f20ad4c5 (commit)
      from  10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36337d07ecfcaa04321cfac40398ebac54accb18
commit 36337d07ecfcaa04321cfac40398ebac54accb18
Merge: 10a7ea1 d4838ac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 14:34:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 9 14:34:06 2015 -0400

    Merge topic 'ctest-submit-content-type' into next
    
    d4838ace fixup! CTest: Set Content-Type header for http file upload (#15774)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4838ace89946d4bdea9bbe6b2a4e5d5f20ad4c5
commit d4838ace89946d4bdea9bbe6b2a4e5d5f20ad4c5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 20:33:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 20:33:48 2015 +0200

    fixup! CTest: Set Content-Type header for http file upload (#15774)

diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 7401ff7..fb6cc00 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -167,7 +167,8 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
   ::curl_easy_setopt(this->Curl, CURLOPT_DEBUGFUNCTION,
                      curlDebugCallback);
   // Be sure to set Content-Type to satisfy fussy modsecurity rules
-  struct curl_slist *headers = ::curl_slist_append(NULL, "Content-Type: text/xml");
+  struct curl_slist *headers = ::curl_slist_append(NULL,
+                                                   "Content-Type: text/xml");
   ::curl_easy_setopt(this->Curl, CURLOPT_HTTPHEADER, headers);
   std::vector<char> responseData;
   std::vector<char> debugData;
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index cb00dce..833cad6 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -338,7 +338,8 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
   CURLcode res;
   FILE* ftpfile;
   char error_buffer[1024];
-  struct curl_slist *headers = ::curl_slist_append(NULL, "Content-Type: text/xml");
+  struct curl_slist *headers = ::curl_slist_append(NULL,
+                                                   "Content-Type: text/xml");
 
   /* In windows, this will init the winsock stuff */
   ::curl_global_init(CURL_GLOBAL_ALL);

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestCurl.cxx          |    3 ++-
 Source/CTest/cmCTestSubmitHandler.cxx |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake