Christopher,
this one should be unchanged. I just fixed the conflict with Aleks' JSON patch.
Best regards
Tim Düsterhus
Apply with `git am --scissors` to automatically cut the commit message.
-- >8 --
This is in preparation for future patches.
---
Makefile | 2 +-
include/haproxy/uri_normalizer.h | 24 ++++++++++++++++++++++++
src/uri_normalizer.c | 21 +++++++++++++++++++++
3 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 include/haproxy/uri_normalizer.h
create mode 100644 src/uri_normalizer.c
diff --git a/Makefile b/Makefile
index 559248867..7b760ba51 100644
--- a/Makefile
+++ b/Makefile
@@ -884,7 +884,7 @@ OBJS += src/mux_h2.o src/mux_fcgi.o src/http_ana.o
src/stream.o \
src/hpack-enc.o src/hpack-huff.o src/ebtree.o src/base64.o
\
src/hash.o src/dgram.o src/version.o src/fix.o src/mqtt.o src/dns.o
\
src/server_state.o src/proto_uxdg.o src/init.o src/cfgdiag.o
\
- src/mjson.o
+ src/mjson.o src/uri_normalizer.o
ifneq ($(TRACE),)
OBJS += src/calltrace.o
diff --git a/include/haproxy/uri_normalizer.h b/include/haproxy/uri_normalizer.h
new file mode 100644
index 000000000..82ef97324
--- /dev/null
+++ b/include/haproxy/uri_normalizer.h
@@ -0,0 +1,24 @@
+/*
+ * include/haproxy/uri_normalizer.h
+ * HTTP request URI normalization.
+ *
+ * Copyright 2021 Tim Duesterhus <t...@bastelstu.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ */
+
+#ifndef _HAPROXY_URI_NORMALIZER_H
+#define _HAPROXY_URI_NORMALIZER_H
+
+#endif /* _HAPROXY_URI_NORMALIZER_H */
+
+/*
+ * Local variables:
+ * c-indent-level: 8
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/src/uri_normalizer.c b/src/uri_normalizer.c
new file mode 100644
index 000000000..7db47d198
--- /dev/null
+++ b/src/uri_normalizer.c
@@ -0,0 +1,21 @@
+/*
+ * HTTP request URI normalization.
+ *
+ * Copyright 2021 Tim Duesterhus <t...@bastelstu.be>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ */
+
+#include <haproxy/api.h>
+#include <haproxy/uri_normalizer.h>
+
+/*
+ * Local variables:
+ * c-indent-level: 8
+ * c-basic-offset: 8
+ * End:
+ */
--
2.31.1
