From: Daniel Carl <danielcarl@gmx.de>
Date: Wed, 28 May 2014 08:22:52 +0000 (+0200)
Subject: Merge branch 'feature/hsts'
X-Git-Url: https://git.owens.tech/projects.html/projects.html/git?a=commitdiff_plain;h=a1d9090cefe78c24bab810d950978f248fc39b88;p=vimb.git

Merge branch 'feature/hsts'

Conflicts:
	config.mk
---

a1d9090cefe78c24bab810d950978f248fc39b88
diff --cc README.md
index d476d15,d476d15..b327f1a
--- a/README.md
+++ b/README.md
@@@ -29,6 -29,6 +29,7 @@@ the [vimb project page][vimb]
  - webinspector that opens ad the bottom of the browser window like in some
    other fat browsers
  - ssl validation against ca-certificate file
++- HTTP Strict Transport Security (HSTS)
  - custom configuration files
  - open input or textarea with configurable external editor
  - user defined URL-shortcuts with placeholders
diff --cc config.mk
index 59219fe,02905b2..4baee69
--- a/config.mk
+++ b/config.mk
@@@ -40,8 -40,8 +40,8 @@@ LIBFLAGS = $(shell pkg-config --libs $(
  
  # normal compiler flags
  CFLAGS  += $(shell pkg-config --cflags $(LIBS))
- CFLAGS  += -Wall -pipe -std=c99 -pedantic
- CFLAGS  += -Wno-overlength-strings
 -CFLAGS  += -Wall -pipe -ansi -std=c99
++CFLAGS  += -Wall -pipe -std=c99
+ CFLAGS  += -Wno-overlength-strings -Werror=format-security
  CFLAGS  += ${CPPFLAGS}
  LDFLAGS += ${LIBFLAGS}
  
diff --cc src/main.c
index ebcc4d4,4ddaafb..8b342a4
--- a/src/main.c
+++ b/src/main.c
@@@ -28,9 -27,9 +28,10 @@@
  #include "dom.h"
  #include "hints.h"
  #include "shortcut.h"
 +#include "handlers.h"
  #include "history.h"
- #include "session.h"
+ #include "cookiejar.h"
+ #include "hsts.h"
  #include "mode.h"
  #include "normal.h"
  #include "ex.h"