Imported Upstream version 1.4.32

1 files changed, 25 insertions, 18 deletions

diff --git a/src/keyvalue.h b/src/keyvalue.h
index e1c940f..43ef99b 100644
--- a/src/keyvalue.h
+++ b/src/keyvalue.h
@@ -2,31 +2,38 @@
 #define _KEY_VALUE_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #ifdef HAVE_PCRE_H
 # include <pcre.h>
 #endif
 
-typedef enum { 
-	HTTP_METHOD_UNSET = -1, 
-	HTTP_METHOD_GET, 
-	HTTP_METHOD_POST, 
-	HTTP_METHOD_HEAD, 
-	HTTP_METHOD_OPTIONS, 
+struct server;
+
+typedef enum {
+	HTTP_METHOD_UNSET = -1,
+	HTTP_METHOD_GET,
+	HTTP_METHOD_POST,
+	HTTP_METHOD_HEAD,
+	HTTP_METHOD_OPTIONS,
 	HTTP_METHOD_PROPFIND,  /* WebDAV */
-	HTTP_METHOD_MKCOL, 
-	HTTP_METHOD_PUT, 
-	HTTP_METHOD_DELETE, 
-	HTTP_METHOD_COPY, 
-	HTTP_METHOD_MOVE, 
-	HTTP_METHOD_PROPPATCH, 
+	HTTP_METHOD_MKCOL,
+	HTTP_METHOD_PUT,
+	HTTP_METHOD_PATCH,
+	HTTP_METHOD_DELETE,
+	HTTP_METHOD_COPY,
+	HTTP_METHOD_MOVE,
+	HTTP_METHOD_PROPPATCH,
 	HTTP_METHOD_REPORT, /* DeltaV */
 	HTTP_METHOD_CHECKOUT,
 	HTTP_METHOD_CHECKIN,
 	HTTP_METHOD_VERSION_CONTROL,
 	HTTP_METHOD_UNCHECKOUT,
+	HTTP_METHOD_MKACTIVITY,
+	HTTP_METHOD_MERGE,
+	HTTP_METHOD_LOCK,
+	HTTP_METHOD_UNLOCK,
 	HTTP_METHOD_LABEL,
 	HTTP_METHOD_CONNECT
 } http_method_t;
@@ -35,13 +42,13 @@ typedef enum { HTTP_VERSION_UNSET = -1, HTTP_VERSION_1_0, HTTP_VERSION_1_1 } htt
 
 typedef struct {
 	int key;
-	
+
 	char *value;
 } keyvalue;
 
 typedef struct {
 	char *key;
-	
+
 	char *value;
 } s_keyvalue;
 
@@ -50,7 +57,7 @@ typedef struct {
 	pcre *key;
 	pcre_extra *key_extra;
 #endif
-	
+
 	buffer *value;
 } pcre_keyvalue;
 
@@ -58,7 +65,7 @@ typedef enum { HTTP_AUTH_BASIC, HTTP_AUTH_DIGEST } httpauth_type;
 
 typedef struct {
 	char *key;
-	
+
 	char *realm;
 	httpauth_type type;
 } httpauth_keyvalue;
@@ -98,7 +105,7 @@ int httpauth_keyvalue_buffer_append(httpauth_keyvalue_buffer *kvb, const char *k
 void httpauth_keyvalue_buffer_free(httpauth_keyvalue_buffer *kvb);
 
 pcre_keyvalue_buffer *pcre_keyvalue_buffer_init(void);
-int pcre_keyvalue_buffer_append(pcre_keyvalue_buffer *kvb, const char *key, const char *value);
+int pcre_keyvalue_buffer_append(struct server *srv, pcre_keyvalue_buffer *kvb, const char *key, const char *value);
 void pcre_keyvalue_buffer_free(pcre_keyvalue_buffer *kvb);
 
 #endif