From 460cbef0b136baa4ca9d590884503859dac16661 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 28 Jan 2007 16:11:23 +0000
Subject: [PATCH] Accept WebDAV methods for subversion in parse_http_request().
 Closes FR 1581425.

---
 AUTHORS    |  1 +
 ChangeLog  | 14 ++++++++++++++
 urlmatch.c | 25 +++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 10873a67..cc4d8610 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -56,6 +56,7 @@ alphabetical order):
  Darel Henman
  Magnus Holmgren
  Derek Jennings
+ Petr Kadlec
  David Laight
  Don Libes  
  Paul Lieverse
diff --git a/ChangeLog b/ChangeLog
index 6c1c5fa0..6822043d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,20 @@ ChangeLog for Privoxy
   is currently toggled off.
 - The show-status CGI page suppresses the edit button
   for action files if Privoxy has no write access.	
+- If Privoxy creates new Trustfile entries, a comment
+  with the trusted referrer is added. (Suggested by Daniel Griscom)
+- Socks errors are no longer handled by the CGI page for
+  DNS resolution failures.
+- CGI pages use favicons to signal whether they are error
+  or control pages. This is useful if you rely heavily on
+  browser tabs.
+- Most CGI error pages react properly to HEAD requests.
+- Requests with RFC 3253 HTTP methods (used by Subversion)
+  are accepted. (Patch provided by Petr Kadlec)
+- New config option "templdir" to change the location
+  of the CGI templates to make sure customized templates
+  aren't "updated".
+- Better handling of "HTTP/1.1 100 Continue" responses.
 - Minor code clean-ups, filter and action file updates.
   (Some of them reported by Davide Alberani, Markus Elfring
   and Adam Piggott)
diff --git a/urlmatch.c b/urlmatch.c
index 549bfa23..2f392588 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -1,4 +1,4 @@
-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.13 2006/12/06 19:50:54 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.14 2007/01/06 14:23:56 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
@@ -6,7 +6,7 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.13 2006/12/06 19:50:54 fabianke
  * Purpose     :  Declares functions to match URLs against URL
  *                patterns.
  *
- * Copyright   :  Written by and Copyright (C) 2001-2003, 2006 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001-2003, 2006-2007 the SourceForge
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -33,6 +33,11 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.13 2006/12/06 19:50:54 fabianke
  *
  * Revisions   :
  *    $Log: urlmatch.c,v $
+ *    Revision 1.14  2007/01/06 14:23:56  fabiankeil
+ *    Fix gcc43 warnings. Mark *csp as immutable
+ *    for parse_http_url() and url_match().
+ *    Replace a sprintf call with snprintf.
+ *
  *    Revision 1.13  2006/12/06 19:50:54  fabiankeil
  *    parse_http_url() now handles intercepted
  *    HTTP request lines as well. Moved parts
@@ -530,6 +535,22 @@ jb_err parse_http_request(const char *req,
          || (0 == strcmpic(v[0], "unsubscribe"))
          || (0 == strcmpic(v[0], "notify"))
          || (0 == strcmpic(v[0], "poll"))
+
+         /*
+          * Or yet another WebDAV extension, this time for
+          * Web Distributed Authoring and Versioning (RFC3253)
+          */
+         || (0 == strcmpic(v[0], "version-control"))
+         || (0 == strcmpic(v[0], "report"))
+         || (0 == strcmpic(v[0], "checkout"))
+         || (0 == strcmpic(v[0], "checkin"))
+         || (0 == strcmpic(v[0], "uncheckout"))
+         || (0 == strcmpic(v[0], "mkworkspace"))
+         || (0 == strcmpic(v[0], "update"))
+         || (0 == strcmpic(v[0], "label"))
+         || (0 == strcmpic(v[0], "merge"))
+         || (0 == strcmpic(v[0], "baseline-control"))
+         || (0 == strcmpic(v[0], "mkactivity"))
          )
    {
       /* Normal */
-- 
2.39.2