Mercurial > pidgin.yaz
view src/accountopt.c @ 7652:ac6b2b3a9a1f
[gaim-migrate @ 8296]
Bj?rn Voigt (bjoernv) writes:
" I found a small problem in Gaim's proxy settings. There
is an option "Use Environmental Settings". This option
does not work as expected.
Gaim reads the environment variables http_proxy (or
HTTP_PROXY or HTTPPROXY) and http_proxy_port (or
HTTP_PROXY_PORT or HTTPPROXYPORT) and variables for
proxy user and proxy password. Gaim expects the
following format:
export http_proxy=your.proxy.server
export http_proxy_port=8080
As far as I know this is a unusual format. Probably
there is no
standard document, which describes the correct format
of proxy
variables, but browsers like Konqueror, Amaya, Lynx and
others use a pseudo standard format:
export http_proxy="http://your.proxy.server:8080/"
The port number defaults to 80. The variable
http_proxy_port is
unknown. The proxy variable format is described in some
W3C pages, for instance:
http://www.w3.org/Daemon/User/Proxies/ProxyClients.html
http://www.w3.org/Library/User/Using/Proxy.html
http://www.w3.org/Amaya/User/Proxy.html
Solution
--------
My patch fixes the proxy environment variable parsing
in src/proxy.c:1626: gaim_proxy_connect(). The patch
removes
http_proxy_port and uses gaim_url_parse() from
src/util.c to parse the http_proxy variable.
Remaining problems
------------------
If a user has adjusted his proxy settings to Gaim's old
proxy variable format, he gets an error. I don't think,
that this is a big problem, as not much users set their
proxy variables only for one program (old proxy
variables where incompatible with browsers like Lynx,
Konqueror,
...).
Gaim still doesn't look at the no_proxy variable. This
variables
defines hosts and domains, which should be connected
directly:
export
no_proxy="cern.ch,ncsa.uiuc.edu,some.host:8080"
For example, one user may want to connect to Yahoo!
over a proxy and to an internal Jabber server without a
proxy. But the user can define individual proxy
variables for each account."
he continues:
"Nathan Walp <faceprint@faceprint.com> wrote:
> Why not have your patch check to see if the http_proxy var
starts with
> "http://", and if so, parse it, otherwise fall
back on the
old behavior.
Ok, the function gaim_url_parse() automatically detects
hostnames and port numbers, if the http_proxy URL does not
start with http://.
My new patch also checks for http_proxy_port. Now my patch
(file proxy2.patch) is fully backward compatible and tested."
given how rarely the current proxy code works, i don't see how this could
possibly make things worse, so i'm taking a chance since it compiles.
someone please test this.
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sat, 29 Nov 2003 03:46:24 +0000 |
parents | e30bedfb99db |
children | fa6395637e2c |
line wrap: on
line source
/** * @file accountopt.c Account Options API * @ingroup core * * gaim * * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "accountopt.h" GaimAccountOption * gaim_account_option_new(GaimPrefType type, const char *text, const char *pref_name) { GaimAccountOption *option; g_return_val_if_fail(type == GAIM_PREF_BOOLEAN || type == GAIM_PREF_INT || type == GAIM_PREF_STRING, NULL); g_return_val_if_fail(text != NULL, NULL); g_return_val_if_fail(pref_name != NULL, NULL); option = g_new0(GaimAccountOption, 1); option->type = type; option->text = g_strdup(text); option->pref_name = g_strdup(pref_name); return option; } GaimAccountOption * gaim_account_option_bool_new(const char *text, const char *pref_name, gboolean default_value) { GaimAccountOption *option; option = gaim_account_option_new(GAIM_PREF_BOOLEAN, text, pref_name); if (option == NULL) return NULL; option->default_value.boolean = default_value; return option; } GaimAccountOption * gaim_account_option_int_new(const char *text, const char *pref_name, int default_value) { GaimAccountOption *option; option = gaim_account_option_new(GAIM_PREF_INT, text, pref_name); if (option == NULL) return NULL; option->default_value.integer = default_value; return option; } GaimAccountOption * gaim_account_option_string_new(const char *text, const char *pref_name, const char *default_value) { GaimAccountOption *option; option = gaim_account_option_new(GAIM_PREF_STRING, text, pref_name); if (option == NULL) return NULL; if (default_value != NULL) option->default_value.string = g_strdup(default_value); return option; } void gaim_account_option_destroy(GaimAccountOption *option) { g_return_if_fail(option != NULL); if (option->text != NULL) g_free(option->text); if (option->pref_name != NULL) g_free(option->pref_name); if (option->type == GAIM_PREF_STRING && option->default_value.string != NULL) { g_free(option->default_value.string); } g_free(option); } void gaim_account_option_set_default_bool(GaimAccountOption *option, gboolean value) { g_return_if_fail(option != NULL); g_return_if_fail(option->type == GAIM_PREF_BOOLEAN); option->default_value.boolean = value; } void gaim_account_option_set_default_int(GaimAccountOption *option, int value) { g_return_if_fail(option != NULL); g_return_if_fail(option->type == GAIM_PREF_INT); option->default_value.integer = value; } void gaim_account_option_set_default_string(GaimAccountOption *option, const char *value) { g_return_if_fail(option != NULL); g_return_if_fail(option->type == GAIM_PREF_STRING); if (option->default_value.string != NULL) g_free(option->default_value.string); option->default_value.string = (value == NULL ? NULL : g_strdup(value)); } GaimPrefType gaim_account_option_get_type(const GaimAccountOption *option) { g_return_val_if_fail(option != NULL, GAIM_PREF_NONE); return option->type; } const char * gaim_account_option_get_text(const GaimAccountOption *option) { g_return_val_if_fail(option != NULL, NULL); return option->text; } const char * gaim_account_option_get_setting(const GaimAccountOption *option) { g_return_val_if_fail(option != NULL, NULL); return option->pref_name; } gboolean gaim_account_option_get_default_bool(const GaimAccountOption *option) { g_return_val_if_fail(option != NULL, FALSE); g_return_val_if_fail(option->type == GAIM_PREF_BOOLEAN, FALSE); return option->default_value.boolean; } int gaim_account_option_get_default_int(const GaimAccountOption *option) { g_return_val_if_fail(option != NULL, -1); g_return_val_if_fail(option->type == GAIM_PREF_INT, -1); return option->default_value.integer; } const char * gaim_account_option_get_default_string(const GaimAccountOption *option) { g_return_val_if_fail(option != NULL, NULL); g_return_val_if_fail(option->type == GAIM_PREF_STRING, NULL); return option->default_value.string; } GaimAccountUserSplit * gaim_account_user_split_new(const char *text, const char *default_value, char sep) { GaimAccountUserSplit *split; g_return_val_if_fail(text != NULL, NULL); g_return_val_if_fail(sep != 0, NULL); split = g_new0(GaimAccountUserSplit, 1); split->text = g_strdup(text); split->field_sep = sep; split->default_value = (default_value == NULL ? NULL : g_strdup(default_value)); return split; } void gaim_account_user_split_destroy(GaimAccountUserSplit *split) { g_return_if_fail(split != NULL); if (split->text != NULL) g_free(split->text); if (split->default_value != NULL) g_free(split->default_value); g_free(split); } const char * gaim_account_user_split_get_text(const GaimAccountUserSplit *split) { g_return_val_if_fail(split != NULL, NULL); return split->text; } const char * gaim_account_user_split_get_default_value(const GaimAccountUserSplit *split) { g_return_val_if_fail(split != NULL, NULL); return split->default_value; } char gaim_account_user_split_get_separator(const GaimAccountUserSplit *split) { g_return_val_if_fail(split != NULL, 0); return split->field_sep; }