strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i29762# Don't override proxy settings if environemnt variables are not set (joined from CWS recovery03)

Browse source
This commit is contained in:
Rüdiger Timm 2004-06-02 13:49:41 +00:00
parent 4e72168953
commit cbb997828b
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crashrep/source/unx/main.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: main.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * 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" ); strEnv = get_environment_string( "ERRORREPORT_RETURNADDRESS" );
if ( strEnv.length() ) if ( strEnv.length() )
{
rSettings[ "EMAIL" ] = strEnv; rSettings[ "EMAIL" ] = strEnv;
rSettings[ "CONTACT" ] = "true";
}
strEnv = get_environment_string( "ERRORREPORT_HTTPPROXYSERVER" ); strEnv = get_environment_string( "ERRORREPORT_HTTPPROXYSERVER" );
if ( strEnv.length() ) if ( strEnv.length() )
@ -1056,17 +1060,17 @@ static void read_settings_from_environment( hash_map< string, string >& rSetting
if ( strEnv.length() ) if ( strEnv.length() )
rSettings[ "PORT" ] = strEnv; rSettings[ "PORT" ] = strEnv;
rSettings[ "USEPROXY" ] = strEnv = get_environment_string( "ERRORREPORT_HTTPCONNECTIONTYPE" );
0 == strcasecmp( get_environment_string( "ERRORREPORT_HTTPCONNECTIONTYPE" ).c_str(), "MANUALPROXY" ) ? if ( strEnv.length() )
"true" : "false"; rSettings[ "USEPROXY" ] = 0 == strcasecmp( strEnv.c_str(), "MANUALPROXY" ) ? "true" : "false";
rSettings[ "CONTACT" ] = rSettings.find( "EMAIL" )->second.length() ? "true" : "false";
strEnv = get_environment_string( "ERRORREPORT_BODYFILE" ); strEnv = get_environment_string( "ERRORREPORT_BODYFILE" );
if ( strEnv.length() ) if ( strEnv.length() )
rSettings[ "DESCRIPTION" ] = read_from_file( strEnv ); 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() static bool setup_version()