aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--AUTHORS3
-rwxr-xr-xexamples/data/uzbl/scripts/cookie_daemon.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 89db5fe..15afb3e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,7 +29,7 @@ Contributors:
(kmeaw) - fix for multibyte utf8 characters segfault
(evocallaghan) - tiny patches
Aaron Griffin (phrakture) - Makefile patches to build on OSX
- Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py, work on uzbl_tabbed.py, cookies_daemon.py
+ Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py, work on uzbl_tabbed.py, cookie_daemon.py
(dequis) - Uzbl.run, birectional socket, javascript commands
Brendan Taylor (bct) - various bugfixes, making misc variables much better using expand(), refactoring some internal var stuff
Chris van Dijk (quigybo) - work on uzbl_tabbed.py
@@ -40,6 +40,7 @@ Contributors:
Andraž 'ruskie' Levstik - font_family patch
Helmut Grohne (helmut) - move void **ptr to union, various fixes
Paweł Zuzelski (pawelz) - download handler proxy patch
+ Michael Fiano (axionix) - added cookie_daemon.py whitelist
Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c
diff --git a/examples/data/uzbl/scripts/cookie_daemon.py b/examples/data/uzbl/scripts/cookie_daemon.py
index 4850802..29d5e47 100755
--- a/examples/data/uzbl/scripts/cookie_daemon.py
+++ b/examples/data/uzbl/scripts/cookie_daemon.py
@@ -4,6 +4,7 @@
# Copyright (c) 2009, Tom Adams <tom@holizz.com>
# Copyright (c) 2009, Dieter Plaetinck <dieter AT plaetinck.be>
# Copyright (c) 2009, Mason Larobina <mason.larobina@gmail.com>
+# Copyright (c) 2009, Michael Fiano <axionix@gmail.com>
#
# 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