Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4374/spambayes

Modified Files:
      Tag: release_1_0-branch
        Dibbler.py 
Log Message:
Backport fix for AUTH digest.

Index: Dibbler.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Dibbler.py,v
retrieving revision 1.13.4.1
retrieving revision 1.13.4.2
diff -C2 -d -r1.13.4.1 -r1.13.4.2
*** Dibbler.py  15 Oct 2004 06:05:33 -0000      1.13.4.1
--- Dibbler.py  20 Dec 2004 03:53:55 -0000      1.13.4.2
***************
*** 347,351 ****
      # RE to extract option="value" fields from
      # digest auth login field
!     _login_splitter = re.compile('([a-zA-Z])+=(".*?"|.*?),?')
  
      def __init__(self, clientSocket, server, context):
--- 347,351 ----
      # RE to extract option="value" fields from
      # digest auth login field
!     _login_splitter = re.compile('([a-zA-Z]+)=(".*?"|.*?),?')
  
      def __init__(self, clientSocket, server, context):
***************
*** 631,634 ****
--- 631,640 ----
          unhashedDigest = ""
          if options.has_key("qop"):
+             # IE 6.0 doesn't give nc back correctly?
+             if not options["nc"]:
+                 options["nc"] = "00000001"
+             # Firefox 1.0 doesn't give qop back correctly?
+             if not options["qop"]:
+                 options["qop"] = "auth"
              unhashedDigest = "%s:%s:%s:%s:%s:%s" % \
                              (HA1, nonce,

_______________________________________________
Spambayes-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/spambayes-checkins

Reply via email to