summaryrefslogtreecommitdiff
path: root/crashrep
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-06-02 13:49:41 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-06-02 13:49:41 +0000
commitcbb997828bf4f816830333a7d0f412d499745444 (patch)
tree3384ba5d69553d5d4acf364ab5bcb2df76d16299 /crashrep
parent4e721689533926efcd350853ea80100e3bb966dd (diff)
#i29762# Don't override proxy settings if environemnt variables are not set (joined from CWS recovery03)
Diffstat (limited to 'crashrep')
-rwxr-xr-xcrashrep/source/unx/main.cxx20
1 files changed, 12 insertions, 8 deletions
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 8ec643d5acaf..00e6ab9d2dd6 100755
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: main.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: hr $ $Date: 2004-05-10 11:05:23 $
+ * last change: $Author: rt $ $Date: 2004-06-02 14:49:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1046,7 +1046,11 @@ static void read_settings_from_environment( hash_map< string, string >& rSetting
strEnv = get_environment_string( "ERRORREPORT_RETURNADDRESS" );
if ( strEnv.length() )
+ {
rSettings[ "EMAIL" ] = strEnv;
+ rSettings[ "CONTACT" ] = "true";
+ }
+
strEnv = get_environment_string( "ERRORREPORT_HTTPPROXYSERVER" );
if ( strEnv.length() )
@@ -1056,17 +1060,17 @@ static void read_settings_from_environment( hash_map< string, string >& rSetting
if ( strEnv.length() )
rSettings[ "PORT" ] = strEnv;
- rSettings[ "USEPROXY" ] =
- 0 == strcasecmp( get_environment_string( "ERRORREPORT_HTTPCONNECTIONTYPE" ).c_str(), "MANUALPROXY" ) ?
- "true" : "false";
-
- rSettings[ "CONTACT" ] = rSettings.find( "EMAIL" )->second.length() ? "true" : "false";
+ strEnv = get_environment_string( "ERRORREPORT_HTTPCONNECTIONTYPE" );
+ if ( strEnv.length() )
+ rSettings[ "USEPROXY" ] = 0 == strcasecmp( strEnv.c_str(), "MANUALPROXY" ) ? "true" : "false";
strEnv = get_environment_string( "ERRORREPORT_BODYFILE" );
if ( strEnv.length() )
rSettings[ "DESCRIPTION" ] = read_from_file( strEnv );
- rSettings[ "TITLE" ] = get_environment_string( "ERRORREPORT_SUBJECT" );
+ strEnv = get_environment_string( "ERRORREPORT_SUBJECT" );
+ if ( strEnv.length() )
+ rSettings[ "TITLE" ] = strEnv;
}
static bool setup_version()