session gets set properly in setup()
This commit is contained in:
parent
1cbeab188d
commit
b2a970d04d
16
surf.c
16
surf.c
|
@ -56,7 +56,6 @@ typedef struct {
|
||||||
|
|
||||||
static Display *dpy;
|
static Display *dpy;
|
||||||
static Atom uriprop, findprop;
|
static Atom uriprop, findprop;
|
||||||
static SoupSession *session;
|
|
||||||
static Client *clients = NULL;
|
static Client *clients = NULL;
|
||||||
static GdkNativeWindow embed = 0;
|
static GdkNativeWindow embed = 0;
|
||||||
static gboolean showxid = FALSE;
|
static gboolean showxid = FALSE;
|
||||||
|
@ -553,13 +552,18 @@ newclient(void) {
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void func(const char *name, const char *value, void *dummy) {
|
||||||
|
printf("%s = %s\n", name, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c) {
|
static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c) {
|
||||||
SoupMessage *msg = webkit_network_request_get_message(req);
|
SoupMessage *msg = webkit_network_request_get_message(req);
|
||||||
SoupMessageHeaders *h;
|
SoupMessageHeaders *h;
|
||||||
if(!msg)
|
if(!msg)
|
||||||
return;
|
return;
|
||||||
h = msg->request_headers;
|
h = msg->request_headers;
|
||||||
soup_message_headers_remove(h, "Cookies");
|
soup_message_headers_foreach(h, func, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -675,10 +679,10 @@ setatom(Client *c, Atom a, const char *v) {
|
||||||
|
|
||||||
void
|
void
|
||||||
setup(void) {
|
setup(void) {
|
||||||
SoupSession *s;
|
|
||||||
char *proxy;
|
char *proxy;
|
||||||
char *new_proxy;
|
char *new_proxy;
|
||||||
SoupURI *puri;
|
SoupURI *puri;
|
||||||
|
SoupSession *s;
|
||||||
|
|
||||||
/* clean up any zombies immediately */
|
/* clean up any zombies immediately */
|
||||||
sigchld(0);
|
sigchld(0);
|
||||||
|
@ -687,7 +691,7 @@ setup(void) {
|
||||||
g_thread_init(NULL);
|
g_thread_init(NULL);
|
||||||
|
|
||||||
dpy = GDK_DISPLAY();
|
dpy = GDK_DISPLAY();
|
||||||
session = webkit_get_default_session();
|
s = webkit_get_default_session();
|
||||||
uriprop = XInternAtom(dpy, "_SURF_URI", False);
|
uriprop = XInternAtom(dpy, "_SURF_URI", False);
|
||||||
findprop = XInternAtom(dpy, "_SURF_FIND", False);
|
findprop = XInternAtom(dpy, "_SURF_FIND", False);
|
||||||
|
|
||||||
|
@ -697,6 +701,10 @@ setup(void) {
|
||||||
scriptfile = buildpath(scriptfile);
|
scriptfile = buildpath(scriptfile);
|
||||||
stylefile = buildpath(stylefile);
|
stylefile = buildpath(stylefile);
|
||||||
|
|
||||||
|
s = webkit_get_default_session();
|
||||||
|
|
||||||
|
soup_session_remove_feature_by_type(s, soup_cookie_get_type());
|
||||||
|
|
||||||
/* proxy */
|
/* proxy */
|
||||||
if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
|
if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
|
||||||
new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
|
new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
|
||||||
|
|
Loading…
Reference in New Issue