Merge branch 'master' into 3.3.0-releng

Makefile

@@ -105,6 +105,12 @@ ifneq ("$(PYTHON)", "")
 	FEATURES_INC+=$(KORE_PYTHON_INC)
 endif
 
+OSNAME=$(shell uname -s | sed -e 's/[-_].*//g' | tr A-Z a-z)
+ifeq ("$(OSNAME)", "freebsd")
+	KORE_CURL_LIB=-L/usr/local/lib -lcurl
+	KORE_CURL_INC=-I/usr/local/include
+endif
+
 ifneq ("$(CURL)", "")
 	S_SRC+=src/curl.c
 	KORE_CURL_LIB?=$(shell pkg-config --libs libcurl)
@@ -120,7 +126,6 @@ ifneq ("$(SANITIZE)", "")
 	LDFLAGS+=-fsanitize=$(SANITIZE)
 endif
 
-OSNAME=$(shell uname -s | sed -e 's/[-_].*//g' | tr A-Z a-z)
 ifeq ("$(OSNAME)", "darwin")
 	CFLAGS+=-I/opt/local/include/ -I/usr/local/opt/openssl/include
 	LDFLAGS+=-L/opt/local/lib -L/usr/local/opt/openssl/lib

examples/async-curl/src/http.c

@@ -80,12 +80,13 @@ state_setup(struct http_request *req)
 	/*
 	 * Bind the HTTP client request to our HTTP request so we get woken
 	 * up once a response is available.
+	 *
+	 * This will put us to sleep.
 	 */
 	kore_curl_bind_request(client, req);
 
 	/*
 	 * Now fire off the request onto the event loop.
-	 * This will put us to sleep.
 	 */
 	kore_curl_run(client);
 

share/man/kodev.1

@@ -60,14 +60,6 @@ Switch between build flavors with the argument being the new flavor.
 Show the help synopsis.
 .RE
 
-.BR \-p
-.RS
-Option used in conjunction with \fBcreate\fR to generate an application for use
-with the
-.BR pyko
-Kore framework.
-.RE
-
 .SH GENERATED FILES
 Executing the
 .BR create
@@ -108,12 +100,6 @@ The 2048-bit DH parameters used by TLS.
 .RE
 .RE
 
-If you specify the
-.BR -p
-flag the generated files will be for use with
-.BR pyko
-instead.
-
 Those files are:
 
 .RS
@@ -263,12 +249,6 @@ Changing flavor of the build;
 $ kodev flavor osx
 .RE
 
-Creating a new application 'app' with \fBpyko\fR support;
-
-.RS
-$ kodev create \-p app
-.RE
-
 Building your application;
 
 .RS

src/http.c

@@ -1947,7 +1947,7 @@ http_response_normal(struct http_request *req, struct connection *c,
 		    http_hsts_enable);
 	}
 
-	if (req != NULL && req->status < HTTP_STATUS_INTERNAL_ERROR) {
+	if (req != NULL) {
 		TAILQ_FOREACH(ck, &(req->resp_cookies), list)
 			http_write_response_cookie(ck);