Merge lp:~cmiller/desktopcouch/couchdb-breaks-basic-auth into lp:desktopcouch

[Chad Miller]

Support new Basic auth for HTTP that our bookmark file requires. (LP: #599745)

[Manuel de la Peña (mandel)]

Looks good to me, just one question, why are you setting the authentication realm to be administrator?

review: Needs Information

[Chad Miller (cmiller)]

No reason, Manuel. It has to be something. I don't think the choice is very important, since the user should never see a password dialog that mentions it.

[Elliot Murphy (statik)]

On Wed, Jul 14, 2010 at 10:01 AM, Chad Miller <email address hidden> wrote:
> No reason, Manuel.  It has to be something.  I don't think the choice is very important, since the user should never see a password dialog that mentions it.

How about 'unused' instead of 'administrator' in order to preemptively
answer this question for future readers of the code?
--
Elliot Murphy | https://launchpad.net/~statik/

[lp:~cmiller/desktopcouch/couchdb-breaks-basic-auth]

166. By Chad Miller on 2010-07-14

Use a more descriptive name for the HTTP Basic auth realm.

=== modified file 'desktopcouch/local_files.py'
--- desktopcouch/local_files.py	2010-05-25 14:05:00 +0000
+++ desktopcouch/local_files.py	2010-07-14 21:05:56 +0000
@@ -75,6 +75,7 @@
             'httpd': {
                 'bind_address': '127.0.0.1',
                 'port': '0',
+                'WWW-Authenticate': 'Basic realm="bookmarkable-user-auth"'
             },
             'log': {
                 'file': ctx.file_log,