|
Line
Link Here
|
| 0 |
-- logjam-4.5.1.orig/src/network-soup.c |
0 |
++ logjam-4.5.1/src/network-soup.c |
|
Lines 51-65
Link Here
|
| 51 |
GString *response = NULL; |
51 |
GString *response = NULL; |
| 52 |
CallbackInfo info = { cb, data, 0, 0 }; |
52 |
CallbackInfo info = { cb, data, 0, 0 }; |
| 53 |
|
53 |
|
| 54 |
suri = soup_uri_new(url); |
54 |
suri = soup_uri_new(conf.options.useproxy ? conf.proxy : url); |
| 55 |
sock = soup_socket_client_new_sync(suri->host, suri->port, NULL, &status); |
55 |
sock = soup_socket_client_new_sync(suri->host, suri->port, NULL, &status); |
| 56 |
if (status != SOUP_STATUS_OK) { |
56 |
if (status != SOUP_STATUS_OK) { |
| 57 |
g_set_error(err, NET_ERROR, NET_ERROR_GENERIC, |
57 |
g_set_error(err, NET_ERROR, NET_ERROR_GENERIC, |
| 58 |
soup_status_get_phrase(status)); |
58 |
soup_status_get_phrase(status)); |
| 59 |
goto out; |
59 |
goto out; |
| 60 |
} |
60 |
} |
|
|
61 |
g_free(suri); |
| 62 |
suri = NULL; |
| 61 |
|
63 |
|
| 62 |
req = soup_message_new(post ? "POST" : "GET", url); |
64 |
suri = soup_uri_new(url); |
|
|
65 |
if(conf.options.useproxy && conf.options.useproxyauth) { |
| 66 |
g_free(suri->user); |
| 67 |
g_free(suri->passwd); |
| 68 |
suri->user = g_strdup(conf.proxyuser); |
| 69 |
suri->passwd = g_strdup(conf.proxypass); |
| 70 |
} |
| 71 |
req = soup_message_new_from_uri(post ? "POST" : "GET", suri); |
| 63 |
g_signal_connect(G_OBJECT(req), "got-chunk", |
72 |
g_signal_connect(G_OBJECT(req), "got-chunk", |
| 64 |
G_CALLBACK(got_chunk_cb), &info); |
73 |
G_CALLBACK(got_chunk_cb), &info); |
| 65 |
for (; headers; headers = headers->next) { |
74 |
for (; headers; headers = headers->next) { |
