Update from Debian version 2.7-1.2.
[pound.git] / debian / patches / 0001-Add-MKCALENDAR-to-xHTTP-2-and-above.patch
1 From: Brett Parker <iDunno@sommitrealweird.co.uk>
2 Date: Sat, 30 Jul 2016 21:47:14 +0100
3 Subject: Add MKCALENDAR to xHTTP 2 and above
4
5 ---
6  config.c | 6 +++---
7  pound.8  | 2 +-
8  2 files changed, 4 insertions(+), 4 deletions(-)
9
10 diff --git a/config.c b/config.c
11 index de1e163..68e2d2f 100644
12 --- a/config.c
13 +++ b/config.c
14 @@ -87,9 +87,9 @@ static regmatch_t   matches[5];
15  static char *xhttp[] = {
16      "^(GET|POST|HEAD) ([^ ]+) HTTP/1.[01]$",
17      "^(GET|POST|HEAD|PUT|PATCH|DELETE) ([^ ]+) HTTP/1.[01]$",
18 -    "^(GET|POST|HEAD|PUT|PATCH|DELETE|LOCK|UNLOCK|PROPFIND|PROPPATCH|SEARCH|MKCOL|MOVE|COPY|OPTIONS|TRACE|MKACTIVITY|CHECKOUT|MERGE|REPORT) ([^ ]+) HTTP/1.[01]$",
19 -    "^(GET|POST|HEAD|PUT|PATCH|DELETE|LOCK|UNLOCK|PROPFIND|PROPPATCH|SEARCH|MKCOL|MOVE|COPY|OPTIONS|TRACE|MKACTIVITY|CHECKOUT|MERGE|REPORT|SUBSCRIBE|UNSUBSCRIBE|BPROPPATCH|POLL|BMOVE|BCOPY|BDELETE|BPROPFIND|NOTIFY|CONNECT) ([^ ]+) HTTP/1.[01]$",
20 -    "^(GET|POST|HEAD|PUT|PATCH|DELETE|LOCK|UNLOCK|PROPFIND|PROPPATCH|SEARCH|MKCOL|MOVE|COPY|OPTIONS|TRACE|MKACTIVITY|CHECKOUT|MERGE|REPORT|SUBSCRIBE|UNSUBSCRIBE|BPROPPATCH|POLL|BMOVE|BCOPY|BDELETE|BPROPFIND|NOTIFY|CONNECT|RPC_IN_DATA|RPC_OUT_DATA) ([^ ]+) HTTP/1.[01]$",
21 +    "^(GET|POST|HEAD|PUT|PATCH|DELETE|LOCK|UNLOCK|PROPFIND|PROPPATCH|SEARCH|MKCOL|MOVE|COPY|OPTIONS|TRACE|MKACTIVITY|CHECKOUT|MERGE|REPORT|MKCALENDAR) ([^ ]+) HTTP/1.[01]$",
22 +    "^(GET|POST|HEAD|PUT|PATCH|DELETE|LOCK|UNLOCK|PROPFIND|PROPPATCH|SEARCH|MKCOL|MOVE|COPY|OPTIONS|TRACE|MKACTIVITY|CHECKOUT|MERGE|REPORT|MKCALENDAR|SUBSCRIBE|UNSUBSCRIBE|BPROPPATCH|POLL|BMOVE|BCOPY|BDELETE|BPROPFIND|NOTIFY|CONNECT) ([^ ]+) HTTP/1.[01]$",
23 +    "^(GET|POST|HEAD|PUT|PATCH|DELETE|LOCK|UNLOCK|PROPFIND|PROPPATCH|SEARCH|MKCOL|MOVE|COPY|OPTIONS|TRACE|MKACTIVITY|CHECKOUT|MERGE|REPORT|MKCALENDAR|SUBSCRIBE|UNSUBSCRIBE|BPROPPATCH|POLL|BMOVE|BCOPY|BDELETE|BPROPFIND|NOTIFY|CONNECT|RPC_IN_DATA|RPC_OUT_DATA) ([^ ]+) HTTP/1.[01]$",
24  };
25  
26  static int  log_level = 1;
27 diff --git a/pound.8 b/pound.8
28 index ceddf48..235d829 100644
29 --- a/pound.8
30 +++ b/pound.8
31 @@ -368,7 +368,7 @@ additionally allow extended HTTP requests (PUT, PATCH, DELETE).
32  .I 2
33  additionally allow standard WebDAV verbs (LOCK, UNLOCK, PROPFIND,
34  PROPPATCH, SEARCH, MKCOL, MOVE, COPY, OPTIONS, TRACE, MKACTIVITY,
35 -CHECKOUT, MERGE, REPORT).
36 +CHECKOUT, MERGE, REPORT, MKCALENDAR).
37  .IP
38  .I 3
39  additionally allow MS extensions WebDAV verbs (SUBSCRIBE, UNSUBSCRIBE,