Skip to content

Commit

Permalink
Merge pull request #188 from ngtcp2/git-submodule-sfparse
Browse files Browse the repository at this point in the history
Pull sfparse via git submodule
  • Loading branch information
tatsuhiro-t authored Feb 2, 2024
2 parents 67f3986 + e755bfb commit ea3e6fe
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 1,561 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "tests/munit"]
path = tests/munit
url = https://github.com/ngtcp2/munit
[submodule "lib/sfparse"]
path = lib/sfparse
url = https://github.com/ngtcp2/sfparse
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ set(nghttp3_SOURCES
nghttp3_opl.c
nghttp3_objalloc.c
nghttp3_unreachable.c
sfparse.c
sfparse/sfparse.c
)

# Public shared library
Expand Down
6 changes: 3 additions & 3 deletions lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = includes

EXTRA_DIST = CMakeLists.txt
EXTRA_DIST = CMakeLists.txt sfparse/COPYING

AM_CFLAGS = $(WARNCFLAGS) $(DEBUGCFLAGS) $(EXTRACFLAG)
AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP3
Expand Down Expand Up @@ -63,7 +63,7 @@ OBJECTS = \
nghttp3_opl.c \
nghttp3_objalloc.c \
nghttp3_unreachable.c \
sfparse.c
sfparse/sfparse.c
HFILES = \
nghttp3_rcbuf.h \
nghttp3_mem.h \
Expand Down Expand Up @@ -91,7 +91,7 @@ HFILES = \
nghttp3_opl.h \
nghttp3_objalloc.h \
nghttp3_unreachable.h \
sfparse.h \
sfparse/sfparse.h \
nghttp3_macro.h

libnghttp3_la_SOURCES = $(HFILES) $(OBJECTS)
Expand Down
2 changes: 1 addition & 1 deletion lib/nghttp3_http.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "nghttp3_macro.h"
#include "nghttp3_conv.h"
#include "nghttp3_unreachable.h"
#include "sfparse.h"
#include "sfparse/sfparse.h"

static uint8_t downcase(uint8_t c) {
return 'A' <= c && c <= 'Z' ? (uint8_t)(c - 'A' + 'a') : c;
Expand Down
1 change: 1 addition & 0 deletions lib/sfparse
Submodule sfparse added at c36bc9
Loading

0 comments on commit ea3e6fe

Please sign in to comment.