Skip to content
This repository has been archived by the owner on Nov 6, 2022. It is now read-only.

Support BIND, REBIND and UNBIND (WebDAV, RFC5842) #242

Closed
wants to merge 3 commits into from
Closed

Support BIND, REBIND and UNBIND (WebDAV, RFC5842) #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce10725
Support BIND (WebDAV, RFC5842, Section 4).
Hywan Apr 24, 2015
2a8159f
Support REBIND (WebDAV, RFC5842, Section 6).
Hywan Apr 24, 2015
64367eb
Support UNBIND (WebDAV, RFC5842, Section 5).
Hywan Apr 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions http_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@ size_t http_parser_execute (http_parser *parser,
parser->method = (enum http_method) 0;
parser->index = 1;
switch (ch) {
case 'B': parser->method = HTTP_BIND; break;
case 'C': parser->method = HTTP_CONNECT; /* or COPY, CHECKOUT */ break;
case 'D': parser->method = HTTP_DELETE; break;
case 'G': parser->method = HTTP_GET; break;
Expand All @@ -968,10 +969,10 @@ size_t http_parser_execute (http_parser *parser,
case 'P': parser->method = HTTP_POST;
/* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */
break;
case 'R': parser->method = HTTP_REPORT; break;
case 'R': parser->method = HTTP_REPORT; /* or REBIND */ break;
case 'S': parser->method = HTTP_SUBSCRIBE; /* or SEARCH */ break;
case 'T': parser->method = HTTP_TRACE; break;
case 'U': parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE */ break;
case 'U': parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE, UNBIND */ break;
default:
SET_ERRNO(HPE_INVALID_METHOD);
goto error;
Expand Down Expand Up @@ -1027,6 +1028,13 @@ size_t http_parser_execute (http_parser *parser,
SET_ERRNO(HPE_INVALID_METHOD);
goto error;
}
} else if (parser->method == HTTP_REPORT) {
if (parser->index == 2 && ch == 'B') {
parser->method = HTTP_REBIND;
} else {
SET_ERRNO(HPE_INVALID_METHOD);
goto error;
}
} else if (parser->index == 1 && parser->method == HTTP_POST) {
if (ch == 'R') {
parser->method = HTTP_PROPFIND; /* or HTTP_PROPPATCH */
Expand All @@ -1049,6 +1057,8 @@ size_t http_parser_execute (http_parser *parser,
} else if (parser->method == HTTP_UNLOCK) {
if (ch == 'S') {
parser->method = HTTP_UNSUBSCRIBE;
} else if(ch == 'B') {
parser->method = HTTP_UNBIND;
} else {
SET_ERRNO(HPE_INVALID_METHOD);
goto error;
Expand Down
27 changes: 15 additions & 12 deletions http_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ typedef int (*http_cb) (http_parser*);
XX(5, CONNECT, CONNECT) \
XX(6, OPTIONS, OPTIONS) \
XX(7, TRACE, TRACE) \
/* webdav */ \
/* WebDAV */ \
XX(8, COPY, COPY) \
XX(9, LOCK, LOCK) \
XX(10, MKCOL, MKCOL) \
Expand All @@ -104,21 +104,24 @@ typedef int (*http_cb) (http_parser*);
XX(13, PROPPATCH, PROPPATCH) \
XX(14, SEARCH, SEARCH) \
XX(15, UNLOCK, UNLOCK) \
XX(16, BIND, BIND) \
XX(17, REBIND, REBIND) \
XX(18, UNBIND, UNBIND) \
/* subversion */ \
XX(16, REPORT, REPORT) \
XX(17, MKACTIVITY, MKACTIVITY) \
XX(18, CHECKOUT, CHECKOUT) \
XX(19, MERGE, MERGE) \
XX(19, REPORT, REPORT) \
XX(20, MKACTIVITY, MKACTIVITY) \
XX(21, CHECKOUT, CHECKOUT) \
XX(22, MERGE, MERGE) \
/* upnp */ \
XX(20, MSEARCH, M-SEARCH) \
XX(21, NOTIFY, NOTIFY) \
XX(22, SUBSCRIBE, SUBSCRIBE) \
XX(23, UNSUBSCRIBE, UNSUBSCRIBE) \
XX(23, MSEARCH, M-SEARCH) \
XX(24, NOTIFY, NOTIFY) \
XX(25, SUBSCRIBE, SUBSCRIBE) \
XX(26, UNSUBSCRIBE, UNSUBSCRIBE) \
/* RFC-5789 */ \
XX(24, PATCH, PATCH) \
XX(25, PURGE, PURGE) \
XX(27, PATCH, PATCH) \
XX(28, PURGE, PURGE) \
/* CalDAV */ \
XX(26, MKCALENDAR, MKCALENDAR) \
XX(29, MKCALENDAR, MKCALENDAR) \

enum http_method
{
Expand Down
3 changes: 3 additions & 0 deletions test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3691,6 +3691,9 @@ main (void)
"PROPFIND",
"PROPPATCH",
"UNLOCK",
"BIND",
"REBIND",
"UNBIND",
"REPORT",
"MKACTIVITY",
"CHECKOUT",
Expand Down