comparison src/proxy.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 <[e-mail]> 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 <[e-mail]>

7651:580bd39219a2

	if (gaim_proxy_info_get_type(phb->gpi) == GAIM_PROXY_USE_ENVVAR) {
		if ((tmp = g_getenv("HTTP_PROXY")) != NULL ||
			(tmp = g_getenv("http_proxy")) != NULL ||
			(tmp= g_getenv("HTTPPROXY")) != NULL) {
			connecthost = tmp;
			gaim_proxy_info_set_host(phb->gpi, connecthost);
		}

		if ((tmp = g_getenv("HTTP_PROXY_PORT")) != NULL ||
			(tmp = g_getenv("http_proxy_port")) != NULL ||
			(tmp = g_getenv("HTTPPROXYPORT")) != NULL) {
			connectport = atoi(tmp);
			gaim_proxy_info_set_port(phb->gpi, connectport);
		}

		if ((tmp = g_getenv("HTTP_PROXY_USER")) != NULL ||
			(tmp = g_getenv("http_proxy_user")) != NULL ||
			(tmp = g_getenv("HTTPPROXYUSER")) != NULL)

7652:ac6b2b3a9a1f

	if (gaim_proxy_info_get_type(phb->gpi) == GAIM_PROXY_USE_ENVVAR) {
		if ((tmp = g_getenv("HTTP_PROXY")) != NULL ||
			(tmp = g_getenv("http_proxy")) != NULL ||
			(tmp= g_getenv("HTTPPROXY")) != NULL) {
			char *proxyhost,*proxypath;
			int proxyport;

			/* http_proxy-format: 
			 * export http_proxy="http://your.proxy.server:port/" 
			 */
			if(gaim_url_parse(tmp, &proxyhost, &proxyport, &proxypath)) {
				gaim_proxy_info_set_host(phb->gpi, proxyhost);
				g_free(proxyhost);
				g_free(proxypath);

				/* only for backward compatibility */
				if (proxyport == 80 && 
				    ((tmp = g_getenv("HTTP_PROXY_PORT")) != NULL ||
				     (tmp = g_getenv("http_proxy_port")) != NULL ||
				     (tmp = g_getenv("HTTPPROXYPORT")) != NULL))
				    proxyport = atoi(tmp);
				
				gaim_proxy_info_set_port(phb->gpi, proxyport);
			}
		}

		if ((tmp = g_getenv("HTTP_PROXY_USER")) != NULL ||
			(tmp = g_getenv("http_proxy_user")) != NULL ||
			(tmp = g_getenv("HTTPPROXYUSER")) != NULL)