diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-07-13 15:11:24 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-07-13 15:11:24 +0000 |
| commit | c38623b68ad6f6d9a521c779ac660b49e1590d64 (patch) | |
| tree | c68b8df8aa12157bc02ad8d8f8b152d040789f9d /usr.sbin/httpd/http.h | |
| parent | 930bafd9d29062c0c02fb19d5b9a4254a569dfda (diff) | |
Sync file to be identical in relayd(8) and httpd(8).
Diffstat (limited to 'usr.sbin/httpd/http.h')
| -rw-r--r-- | usr.sbin/httpd/http.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/httpd/http.h b/usr.sbin/httpd/http.h index 46273b7a18b..af2627f6d2e 100644 --- a/usr.sbin/httpd/http.h +++ b/usr.sbin/httpd/http.h @@ -1,4 +1,4 @@ -/* $OpenBSD: http.h,v 1.2 2014/07/13 14:17:37 reyk Exp $ */ +/* $OpenBSD: http.h,v 1.3 2014/07/13 15:11:23 reyk Exp $ */ /* * Copyright (c) 2012 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _HTTPD_HTTP_H -#define _HTTPD_HTTP_H +#ifndef _HTTP_H +#define _HTTP_H enum httpmethod { HTTP_METHOD_NONE = 0, @@ -140,10 +140,13 @@ struct http_mediatype { /* Used during runtime */ struct http_descriptor { struct kv http_pathquery; + struct kv http_matchquery; #define http_path http_pathquery.kv_key #define http_query http_pathquery.kv_value #define http_rescode http_pathquery.kv_key #define http_resmesg http_pathquery.kv_value +#define query_key http_matchquery.kv_key +#define query_val http_matchquery.kv_value char *http_version; enum httpmethod http_method; @@ -154,4 +157,4 @@ struct http_descriptor { struct kv *http_lastheader; }; -#endif /* _HTTPD_HTTP_H */ +#endif /* _HTTP_H */ |