[Libreoffice-commits] core.git: desktop/source

[Markus Mohrhard]

 desktop/source/app/sofficemain.cxx          |    1 +
 desktop/source/minidump/minidump_upload.cxx |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d837a11388ca1c29ce9f495832e52e0809b601de
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jan 6 13:56:47 2016 +0100

    store the URL in the crash ini file
    
    Change-Id: I1b5f29f864d01c238f2e21de87dde8005236f332
    Reviewed-on: https://gerrit.libreoffice.org/22564
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 742bbba..b1b7dba 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -99,6 +99,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
     std::ofstream minidump_file(ini_path, std::ios_base::trunc);
     minidump_file << "ProductName=LibreOffice\n";
     minidump_file << "Version=" << LIBO_VERSION_DOTTED << "\n";
+    minidump_file << "URL=" << "http://127.0.0.1:8000/submit" << "\n";
     minidump_file.close();
 
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
diff --git a/desktop/source/minidump/minidump_upload.cxx b/desktop/source/minidump/minidump_upload.cxx
index 29814be..968adc0 100644
--- a/desktop/source/minidump/minidump_upload.cxx
+++ b/desktop/source/minidump/minidump_upload.cxx
@@ -68,15 +68,16 @@ bool uploadContent(std::map<std::string, std::string>& parameters)
     if (!curl)
         return false;
 
-    std::string proxy, proxy_user_pwd, ca_certificate_file, file;
-
-    std::string url = "http://libreofficecrash.org/submit";
+    std::string proxy, proxy_user_pwd, ca_certificate_file, file, url;
 
     getProperty("Proxy", proxy, parameters);
     getProperty("ProxyUserPW", proxy_user_pwd, parameters);
     getProperty("CAFile", ca_certificate_file, parameters);
 
     getProperty("DumpFile", file, parameters);
+    getProperty("URL", file, parameters);
+    if (url.empty())
+        return false;
 
     curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
     curl_easy_setopt(curl, CURLOPT_USERAGENT, kUserAgent);