callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo my incorrect fix - I misunderstood danw - sorry!

Browse Source 
2000-11-03  Jeffrey Stedfast  <fejj@helixcode.com>

	* camel-url.c: Undo my incorrect fix - I misunderstood danw -
	sorry!

svn path=/trunk/; revision=6386
This commit is contained in:
Jeffrey Stedfast
2000-11-03 23:07:47 +00:00
committed by Jeffrey Stedfast
parent 0d78f798da
commit e47b962e0d
2 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camel/ChangeLog
View File

@ -1,3 +1,8 @@
2000-11-03 Jeffrey Stedfast <fejj@helixcode.com>
* camel-url.c: Undo my incorrect fix - I misunderstood danw -
sorry!
2000-11-03 Dan Winship <danw@helixcode.com>
* providers/pop3/camel-pop3-store.c (camel_pop3_store_expunge):

30
camel/camel-url.c
View File

@ -116,19 +116,8 @@ camel_url_new (const char *url_string, CamelException *ex)
if (at && (!slash || at < slash)) {
colon = strchr (url_string, ':');
if (colon && colon < at) {
/* assume password is base64 encoded */
int state = 0; int save = 0;
char *passwd;
int len;
passwd = g_strndup (colon + 1, at - colon - 1);
camel_url_decode (passwd);
len = strlen (passwd);
url->passwd = g_malloc (len);
len = base64_decode_step (passwd, len, url->passwd, &state, &save);
url->passwd[len] = '\0';
url->passwd = g_strndup (colon + 1, at - colon - 1);
camel_url_decode (url->passwd);
} else {
url->passwd = NULL;
colon = at;
@ -199,19 +188,8 @@ camel_url_to_string (CamelURL *url, gboolean show_passwd)
if (url->authmech)
authmech = camel_url_encode (url->authmech, TRUE, ":@/");
if (show_passwd && url->passwd) {
int state = 0, save = 0;
int len;
char *pass;
len = strlen (url->passwd);
pass = g_malloc ((int)(len * 4 / 3) + 4);
len = base64_encode_close (url->passwd, len, FALSE, pass, &state, &save);
pass[len] = '\0';
passwd = camel_url_encode (pass, TRUE, "/");
g_free (pass);
}
if (show_passwd && url->passwd)
passwd = camel_url_encode (url->passwd, TRUE, "@/");
if (url->host)
host = camel_url_encode (url->host, TRUE, ":/");