breaking http-svr.c to multiple files

mio/lib/Makefile.am

@@ -56,7 +56,9 @@ libmio_la_SOURCES = \
 	htrd.c \
 	htre.c \
 	http.c \
+	http-cgi.c \
 	http-svr.c \
+	http-thr.c \
 	mio-prv.h \
 	mio.c \
 	nwif.c \

mio/lib/Makefile.in

@@ -141,13 +141,14 @@ libmio_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 am_libmio_la_OBJECTS = libmio_la-chr.lo libmio_la-dns.lo \
 	libmio_la-dns-cli.lo libmio_la-ecs.lo libmio_la-err.lo \
 	libmio_la-fmt.lo libmio_la-htb.lo libmio_la-htrd.lo \
-	libmio_la-htre.lo libmio_la-http.lo libmio_la-http-svr.lo \
+	libmio_la-htre.lo libmio_la-http.lo libmio_la-http-cgi.lo \
-	libmio_la-mio.lo libmio_la-nwif.lo libmio_la-path.lo \
+	libmio_la-http-svr.lo libmio_la-http-thr.lo libmio_la-mio.lo \
-	libmio_la-pipe.lo libmio_la-pro.lo libmio_la-sck.lo \
+	libmio_la-nwif.lo libmio_la-path.lo libmio_la-pipe.lo \
-	libmio_la-skad.lo libmio_la-sys.lo libmio_la-sys-ass.lo \
+	libmio_la-pro.lo libmio_la-sck.lo libmio_la-skad.lo \
-	libmio_la-sys-err.lo libmio_la-sys-log.lo libmio_la-sys-mux.lo \
+	libmio_la-sys.lo libmio_la-sys-ass.lo libmio_la-sys-err.lo \
-	libmio_la-sys-tim.lo libmio_la-thr.lo libmio_la-tmr.lo \
+	libmio_la-sys-log.lo libmio_la-sys-mux.lo libmio_la-sys-tim.lo \
-	libmio_la-utf8.lo libmio_la-utl.lo
+	libmio_la-thr.lo libmio_la-tmr.lo libmio_la-utf8.lo \
+	libmio_la-utl.lo
 libmio_la_OBJECTS = $(am_libmio_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -177,7 +178,9 @@ am__depfiles_remade = ./$(DEPDIR)/libmio_la-chr.Plo \
 	./$(DEPDIR)/libmio_la-err.Plo ./$(DEPDIR)/libmio_la-fmt.Plo \
 	./$(DEPDIR)/libmio_la-htb.Plo ./$(DEPDIR)/libmio_la-htrd.Plo \
 	./$(DEPDIR)/libmio_la-htre.Plo \
+	./$(DEPDIR)/libmio_la-http-cgi.Plo \
 	./$(DEPDIR)/libmio_la-http-svr.Plo \
+	./$(DEPDIR)/libmio_la-http-thr.Plo \
 	./$(DEPDIR)/libmio_la-http.Plo ./$(DEPDIR)/libmio_la-mio.Plo \
 	./$(DEPDIR)/libmio_la-nwif.Plo ./$(DEPDIR)/libmio_la-path.Plo \
 	./$(DEPDIR)/libmio_la-pipe.Plo ./$(DEPDIR)/libmio_la-pro.Plo \
@@ -379,6 +382,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -442,7 +446,9 @@ libmio_la_SOURCES = \
 	htrd.c \
 	htre.c \
 	http.c \
+	http-cgi.c \
 	http-svr.c \
+	http-thr.c \
 	mio-prv.h \
 	mio.c \
 	nwif.c \
@@ -571,7 +577,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-htb.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-htrd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-htre.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-http-cgi.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-http-svr.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-http-thr.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-http.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-mio.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmio_la-nwif.Plo@am__quote@ # am--include-marker
@@ -691,6 +699,13 @@ libmio_la-http.lo: http.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmio_la-http.lo `test -f 'http.c' || echo '$(srcdir)/'`http.c
 
+libmio_la-http-cgi.lo: http-cgi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmio_la-http-cgi.lo -MD -MP -MF $(DEPDIR)/libmio_la-http-cgi.Tpo -c -o libmio_la-http-cgi.lo `test -f 'http-cgi.c' || echo '$(srcdir)/'`http-cgi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmio_la-http-cgi.Tpo $(DEPDIR)/libmio_la-http-cgi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='http-cgi.c' object='libmio_la-http-cgi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmio_la-http-cgi.lo `test -f 'http-cgi.c' || echo '$(srcdir)/'`http-cgi.c
+
 libmio_la-http-svr.lo: http-svr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmio_la-http-svr.lo -MD -MP -MF $(DEPDIR)/libmio_la-http-svr.Tpo -c -o libmio_la-http-svr.lo `test -f 'http-svr.c' || echo '$(srcdir)/'`http-svr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmio_la-http-svr.Tpo $(DEPDIR)/libmio_la-http-svr.Plo
@@ -698,6 +713,13 @@ libmio_la-http-svr.lo: http-svr.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmio_la-http-svr.lo `test -f 'http-svr.c' || echo '$(srcdir)/'`http-svr.c
 
+libmio_la-http-thr.lo: http-thr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmio_la-http-thr.lo -MD -MP -MF $(DEPDIR)/libmio_la-http-thr.Tpo -c -o libmio_la-http-thr.lo `test -f 'http-thr.c' || echo '$(srcdir)/'`http-thr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmio_la-http-thr.Tpo $(DEPDIR)/libmio_la-http-thr.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='http-thr.c' object='libmio_la-http-thr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmio_la-http-thr.lo `test -f 'http-thr.c' || echo '$(srcdir)/'`http-thr.c
+
 libmio_la-mio.lo: mio.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmio_la-mio.lo -MD -MP -MF $(DEPDIR)/libmio_la-mio.Tpo -c -o libmio_la-mio.lo `test -f 'mio.c' || echo '$(srcdir)/'`mio.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmio_la-mio.Tpo $(DEPDIR)/libmio_la-mio.Plo
@@ -981,7 +1003,9 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libmio_la-htb.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-htrd.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-htre.Plo
+	-rm -f ./$(DEPDIR)/libmio_la-http-cgi.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-http-svr.Plo
+	-rm -f ./$(DEPDIR)/libmio_la-http-thr.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-http.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-mio.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-nwif.Plo
@@ -1055,7 +1079,9 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libmio_la-htb.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-htrd.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-htre.Plo
+	-rm -f ./$(DEPDIR)/libmio_la-http-cgi.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-http-svr.Plo
+	-rm -f ./$(DEPDIR)/libmio_la-http-thr.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-http.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-mio.Plo
 	-rm -f ./$(DEPDIR)/libmio_la-nwif.Plo

mio/lib/chr.c

@@ -24,8 +24,8 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-chr.h"
+#include <mio-chr.h>
-#include "mio-utl.h"
+#include <mio-utl.h>
 
 /* ---------------------------------------------------------- */
 #include "uch-prop.h"

mio/lib/dns.c

@@ -24,7 +24,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-dns.h"
+#include <mio-dns.h>
 #include "mio-prv.h"
 
 /* ----------------------------------------------------------------------- */

mio/lib/ecs.c

@@ -24,8 +24,8 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-ecs.h"
+#include <mio-ecs.h>
-#include "mio-fmt.h"
+#include <mio-fmt.h>
 #include "mio-prv.h"
 
 #define _FN(type,verb) mio_ ## type  ## _ ## verb

mio/lib/err.c

@@ -25,7 +25,7 @@
  */
 
 #include "mio-prv.h"
-#include "mio-fmt.h"
+#include <mio-fmt.h>
 
 static mio_ooch_t errstr_0[] = {'n', 'o', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
 static mio_ooch_t errstr_1[] = {'g', 'e', 'n', 'e', 'r', 'i', 'c', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
@@ -45,20 +45,21 @@ static mio_ooch_t errstr_14[] = {'i', 'n', 't', 'e', 'r', 'r', 'u', 'p', 't', 'e
 static mio_ooch_t errstr_15[] = {'p', 'i', 'p', 'e', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
 static mio_ooch_t errstr_16[] = {'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', ' ', 't', 'e', 'm', 'p', 'o', 'r', 'a', 'r', 'i', 'l', 'y', ' ', 'u', 'n', 'a', 'v', 'a', 'i', 'l', 'a', 'b', 'l', 'e', '\0' };
 static mio_ooch_t errstr_17[] = {'b', 'a', 'd', ' ', 's', 'y', 's', 't', 'e', 'm', ' ', 'h', 'a', 'n', 'd', 'l', 'e', '\0' };
-static mio_ooch_t errstr_18[] = {'t', 'o', 'o', ' ', 'm', 'a', 'n', 'y', ' ', 'o', 'p', 'e', 'n', ' ', 'f', 'i', 'l', 'e', 's', '\0' };
+static mio_ooch_t errstr_18[] = {'b', 'a', 'd', ' ', 'r', 'e', 'q', 'u', 'e', 's', 't', ' ', 'o', 'r', ' ', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\0' };
 static mio_ooch_t errstr_19[] = {'t', 'o', 'o', ' ', 'm', 'a', 'n', 'y', ' ', 'o', 'p', 'e', 'n', ' ', 'f', 'i', 'l', 'e', 's', '\0' };
-static mio_ooch_t errstr_20[] = {'I', '/', 'O', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
+static mio_ooch_t errstr_20[] = {'t', 'o', 'o', ' ', 'm', 'a', 'n', 'y', ' ', 'o', 'p', 'e', 'n', ' ', 'f', 'i', 'l', 'e', 's', '\0' };
-static mio_ooch_t errstr_21[] = {'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', ' ', 'c', 'o', 'n', 'v', 'e', 'r', 's', 'i', 'o', 'n', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
+static mio_ooch_t errstr_21[] = {'I', '/', 'O', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
-static mio_ooch_t errstr_22[] = {'i', 'n', 's', 'u', 'f', 'f', 'i', 'c', 'i', 'e', 'n', 't', ' ', 'd', 'a', 't', 'a', ' ', 'f', 'o', 'r', ' ', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', ' ', 'c', 'o', 'n', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\0' };
+static mio_ooch_t errstr_22[] = {'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', ' ', 'c', 'o', 'n', 'v', 'e', 'r', 's', 'i', 'o', 'n', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
-static mio_ooch_t errstr_23[] = {'b', 'u', 'f', 'f', 'e', 'r', ' ', 'f', 'u', 'l', 'l', '\0' };
+static mio_ooch_t errstr_23[] = {'i', 'n', 's', 'u', 'f', 'f', 'i', 'c', 'i', 'e', 'n', 't', ' ', 'd', 'a', 't', 'a', ' ', 'f', 'o', 'r', ' ', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', ' ', 'c', 'o', 'n', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\0' };
-static mio_ooch_t errstr_24[] = {'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', ' ', 'r', 'e', 'f', 'u', 's', 'e', 'd', '\0' };
+static mio_ooch_t errstr_24[] = {'b', 'u', 'f', 'f', 'e', 'r', ' ', 'f', 'u', 'l', 'l', '\0' };
-static mio_ooch_t errstr_25[] = {'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', ' ', 'r', 'e', 's', 'e', 't', '\0' };
+static mio_ooch_t errstr_25[] = {'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', ' ', 'r', 'e', 'f', 'u', 's', 'e', 'd', '\0' };
-static mio_ooch_t errstr_26[] = {'n', 'o', ' ', 'c', 'a', 'p', 'a', 'b', 'i', 'l', 'i', 't', 'y', '\0' };
+static mio_ooch_t errstr_26[] = {'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', ' ', 'r', 'e', 's', 'e', 't', '\0' };
-static mio_ooch_t errstr_27[] = {'t', 'i', 'm', 'e', 'd', ' ', 'o', 'u', 't', '\0' };
+static mio_ooch_t errstr_27[] = {'n', 'o', ' ', 'c', 'a', 'p', 'a', 'b', 'i', 'l', 'i', 't', 'y', '\0' };
-static mio_ooch_t errstr_28[] = {'n', 'o', ' ', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\0' };
+static mio_ooch_t errstr_28[] = {'t', 'i', 'm', 'e', 'd', ' ', 'o', 'u', 't', '\0' };
-static mio_ooch_t errstr_29[] = {'u', 'n', 'a', 'b', 'l', 'e', ' ', 't', 'o', ' ', 'm', 'a', 'k', 'e', ' ', 'd', 'e', 'v', 'i', 'c', 'e', '\0' };
+static mio_ooch_t errstr_29[] = {'n', 'o', ' ', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\0' };
-static mio_ooch_t errstr_30[] = {'d', 'e', 'v', 'i', 'c', 'e', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
+static mio_ooch_t errstr_30[] = {'u', 'n', 'a', 'b', 'l', 'e', ' ', 't', 'o', ' ', 'm', 'a', 'k', 'e', ' ', 'd', 'e', 'v', 'i', 'c', 'e', '\0' };
-static mio_ooch_t errstr_31[] = {'d', 'e', 'v', 'i', 'c', 'e', ' ', 'h', 'a', 'n', 'g', '-', 'u', 'p', '\0' };
+static mio_ooch_t errstr_31[] = {'d', 'e', 'v', 'i', 'c', 'e', ' ', 'e', 'r', 'r', 'o', 'r', '\0' };
+static mio_ooch_t errstr_32[] = {'d', 'e', 'v', 'i', 'c', 'e', ' ', 'h', 'a', 'n', 'g', '-', 'u', 'p', '\0' };
 static mio_ooch_t* errstr[] =
 {
 	errstr_0, errstr_1, errstr_2, errstr_3, errstr_4,
@@ -67,9 +68,10 @@ static mio_ooch_t* errstr[] =
 	errstr_15, errstr_16, errstr_17, errstr_18, errstr_19,
 	errstr_20, errstr_21, errstr_22, errstr_23, errstr_24,
 	errstr_25, errstr_26, errstr_27, errstr_28, errstr_29,
-	errstr_30, errstr_31
+	errstr_30, errstr_31, errstr_32
 };
 
+
 /* -------------------------------------------------------------------------- 
  * ERROR NUMBER TO STRING CONVERSION
  * -------------------------------------------------------------------------- */

mio/lib/fmt.c

@@ -64,7 +64,7 @@
  *
  */
 
-#include "mio-fmt.h"
+#include <mio-fmt.h>
 #include "mio-prv.h"
 
 

mio/lib/htrd.c

@@ -22,9 +22,9 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-htrd.h"
+#include <mio-htrd.h>
-#include "mio-chr.h"
+#include <mio-chr.h>
-#include "mio-path.h"
+#include <mio-path.h>
 #include "mio-prv.h"
 
 static const mio_bch_t NUL = '\0';

mio/lib/htre.c

@@ -25,6 +25,7 @@
  */
 
 #include <mio-htre.h>
+#include <mio-http.h>
 #include "mio-prv.h"
 
 static void free_hdrval (mio_htb_t* htb, void* vptr, mio_oow_t vlen)

mio/lib/http-prv.h

@@ -0,0 +1,101 @@
+/*
+ * $Id$
+ *
+    Copyright (c) 2016-2020 Chung, Hyung-Hwan. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WAfRRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _MIO_HTTP_PRV_H_
+#define _MIO_HTTP_PRV_H_
+
+#include <mio-http.h>
+#include <mio-htrd.h>
+#include <mio-sck.h>
+#include "mio-prv.h"
+
+typedef struct mio_svc_htts_cli_t mio_svc_htts_cli_t;
+struct mio_svc_htts_cli_t
+{
+	mio_svc_htts_cli_t* cli_prev;
+	mio_svc_htts_cli_t* cli_next;
+
+	/* a listener socket sets htts and sck fields only */
+	/* a client sockets uses all the fields in this struct */
+	mio_svc_htts_t* htts;
+	mio_dev_sck_t* sck;
+
+	mio_htrd_t* htrd;
+	mio_becs_t* sbuf; /* temporary buffer for status line formatting */
+
+	mio_svc_htts_rsrc_t* rsrc;
+};
+
+struct mio_svc_htts_cli_htrd_xtn_t
+{
+	mio_dev_sck_t* sck;
+};
+typedef struct mio_svc_htts_cli_htrd_xtn_t mio_svc_htts_cli_htrd_xtn_t;
+
+struct mio_svc_htts_t
+{
+	MIO_SVC_HEADER;
+
+	mio_svc_htts_proc_req_t proc_req;
+
+	mio_dev_sck_t* lsck;
+	mio_svc_htts_cli_t cli; /* list head for client list */
+
+	mio_bch_t* server_name;
+	mio_bch_t server_name_buf[64];
+};
+
+struct mio_svc_httc_t
+{
+	MIO_SVC_HEADER;
+};
+
+#define MIO_SVC_HTTS_CLIL_APPEND_CLI(lh,cli) do { \
+	(cli)->cli_next = (lh); \
+	(cli)->cli_prev = (lh)->cli_prev; \
+	(cli)->cli_prev->cli_next = (cli); \
+	(lh)->cli_prev = (cli); \
+} while(0)
+
+#define MIO_SVC_HTTS_CLIL_UNLINK_CLI(cli) do { \
+	(cli)->cli_prev->cli_next = (cli)->cli_next; \
+	(cli)->cli_next->cli_prev = (cli)->cli_prev; \
+} while (0)
+
+#define MIO_SVC_HTTS_CLIL_UNLINK_CLI_CLEAN(cli) do { \
+	(cli)->cli_prev->cli_next = (cli)->cli_next; \
+	(cli)->cli_next->cli_prev = (cli)->cli_prev; \
+	(cli)->cli_prev = (cli); \
+	(cli)->cli_next = (cli); \
+} while (0)
+
+#define MIO_SVC_HTTS_CLIL_INIT(lh) ((lh)->cli_next = (lh)->cli_prev = lh)
+#define MIO_SVC_HTTS_CLIL_FIRST_CLI(lh) ((lh)->cli_next)
+#define MIO_SVC_HTTS_CLIL_LAST_CLI(lh) ((lh)->cli_prev)
+#define MIO_SVC_HTTS_CLIL_IS_EMPTY(lh) (MIO_SVC_HTTS_CLIL_FIRST_CLI(lh) == (lh))
+#define MIO_SVC_HTTS_CLIL_IS_NIL_CLI(lh,cli) ((cli) == (lh))
+
+#endif

mio/lib/http-thr.c

@@ -0,0 +1,81 @@
+/*
+ * $Id$
+ *
+    Copyright (c) 2016-2020 Chung, Hyung-Hwan. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WAfRRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "http-prv.h"
+#include <mio-thr.h>
+#include <mio-fmt.h>
+#include <mio-chr.h>
+
+#include <pthread.h>
+
+struct thr_state_t
+{
+	MIO_SVC_HTTS_RSRC_HEADER;
+	pthread_t thr;
+	mio_svc_htts_thr_func_t func;
+	mio_dev_t* p1; /* change it to pipe */
+};
+
+typedef struct thr_state_t thr_state_t;
+
+static void thr_state_on_kill (thr_state_t* thr_state)
+{
+}
+
+static void* thr_state_run_func (void* arg)
+{
+	thr_state_t* thr_state = (thr_state_t*)arg;
+
+//	thr_state->func (thr_state->XXX, thr_state->p1->fd); /* pass the pointer to data that can be accessed safely inside a thread. mostly these must be duplicates of core data */
+	return MIO_NULL;
+}
+
+int mio_svc_htts_dothr (mio_svc_htts_t* htts, mio_dev_sck_t* csck, mio_htre_t* req, mio_svc_htts_thr_func_t func)
+{
+	/*mio_t* mio = htts->mio;*/
+//	mio_svc_htts_cli_t* cli = mio_dev_sck_getxtn(csck);
+	thr_state_t* thr_state = MIO_NULL;
+
+	thr_state = (thr_state_t*)mio_svc_htts_rsrc_make(htts, MIO_SIZEOF(*thr_state), thr_state_on_kill);
+	if (MIO_UNLIKELY(!thr_state)) goto oops;
+
+	thr_state->func = func;
+
+#if 0
+	thr_state->p1 = mio_dev_pipe_make(mio);
+	if (MIO_UNLIKELY(!thr_state->p1)) goto oops;
+#endif
+
+	if (pthread_create(&thr_state->thr, MIO_NULL, thr_state_run_func, thr_state) != 0)
+	{
+	}
+
+	return 0;
+
+oops:
+	//if (thr_state) thr_state_halt_particiapting_devices (thr_state);
+	return -1;
+}
+

mio/lib/http.c

@@ -22,9 +22,9 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-http.h"
+#include <mio-http.h>
-#include "mio-chr.h"
+#include <mio-chr.h>
-#include "mio-utl.h"
+#include <mio-utl.h>
 #include "mio-prv.h"
 #include <time.h>
 

mio/lib/mio-prv.h

@@ -27,8 +27,8 @@
 #ifndef _MIO_PRV_H_
 #define _MIO_PRV_H_
 
-#include "mio.h"
+#include <mio.h>
-#include "mio-utl.h"
+#include <mio-utl.h>
 
 #if defined(__has_builtin)
 

mio/lib/mio-utl.h

@@ -27,7 +27,7 @@
 #ifndef _MIO_UTL_H_
 #define _MIO_UTL_H_
 
-#include "mio-cmn.h"
+#include <mio-cmn.h>
 #include <stdarg.h>
 
 /* =========================================================================

mio/lib/mio.c

@@ -25,8 +25,8 @@
  */
 
 #include "mio-prv.h"
-#include "mio-fmt.h"
+#include <mio-fmt.h>
-#include <stdlib.h>
+#include <stdlib.h> /* malloc, free, etc */
   
 #define DEV_CAP_ALL_WATCHED (MIO_DEV_CAP_IN_WATCHED | MIO_DEV_CAP_OUT_WATCHED | MIO_DEV_CAP_PRI_WATCHED)
 

mio/lib/mio.h

@@ -92,6 +92,7 @@ enum mio_errnum_t
 	MIO_EPIPE,    /**< pipe error */
 	MIO_EAGAIN,   /**< resource temporarily unavailable */
 	MIO_EBADHND,  /**< bad system handle */
+	MIO_EBADRE,   /**< bad request or response */
 
 	MIO_EMFILE,   /**< too many open files */
 	MIO_ENFILE,   /**< too many open files */

mio/lib/nwif.c

@@ -24,7 +24,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-nwif.h"
+#include <mio-nwif.h>
 #include "mio-prv.h"
 
 #if defined(_WIN32)

mio/lib/path.c

@@ -24,7 +24,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-path.h"
+#include <mio-path.h>
 #include "mio-prv.h"
 
 /* TODO: support the \\?\ prefix and the \\.\ prefix on windows 

mio/lib/pipe.c

@@ -24,7 +24,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-pipe.h"
+#include <mio-pipe.h>
 #include "mio-prv.h"
 
 #include <unistd.h>

mio/lib/pro.c

@@ -24,7 +24,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-pro.h"
+#include <mio-pro.h>
 #include "mio-prv.h"
 
 #include <unistd.h>

mio/lib/sck.c

@@ -25,7 +25,7 @@
  */
 
 
-#include "mio-sck.h"
+#include <mio-sck.h>
 #include "mio-prv.h"
 
 #include <sys/socket.h>

mio/lib/skad.c

@@ -24,9 +24,9 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-skad.h"
+#include <mio-skad.h>
-#include "mio-nwif.h"
+#include <mio-nwif.h>
-#include "mio-fmt.h"
+#include <mio-fmt.h>
 #include "mio-prv.h"
 
 #include <sys/types.h>

mio/lib/sys-prv.h

@@ -24,8 +24,8 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MIO_SYS_H_
+#ifndef _MIO_SYS_PRV_H_
-#define _MIO_SYS_H_
+#define _MIO_SYS_PRV_H_
 
 /* this is a private header file used by sys-XXX files */
 

mio/lib/thr.c

@@ -24,7 +24,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mio-thr.h"
+#include <mio-thr.h>
 #include "mio-prv.h"
 
 #include <unistd.h>

mio/lib/utl.c

@@ -25,7 +25,7 @@
  */
 
 #include "mio-prv.h"
-#include "mio-chr.h"
+#include <mio-chr.h>
 
 /* ========================================================================= */