More work on http responses

2014-07-20 21:25:53 +01:00
parent e56f8f3715
commit b51ca6262a
14 changed files with 419 additions and 53 deletions
--- a/nbproject/Makefile-Debug.mk
+++ b/nbproject/Makefile-Debug.mk
@@ -35,6 +35,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}

 # Object Files
 OBJECTFILES= \
+	${OBJECTDIR}/src/http/basicresponses.o \
 	${OBJECTDIR}/src/http/http.o \
 	${OBJECTDIR}/src/http/request.o \
 	${OBJECTDIR}/src/main.o \
@@ -42,7 +43,7 @@ OBJECTFILES= \


 # C Compiler Flags
-CFLAGS=
+CFLAGS=-O0

 # CC Compiler Flags
 CCFLAGS=
@@ -55,7 +56,7 @@ FFLAGS=
 ASFLAGS=

 # Link Libraries and Options
-LDLIBSOPTIONS=
+LDLIBSOPTIONS=-lpthread

 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
@@ -65,25 +66,30 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp ${OBJECTFILES} ${LDLIBSOPTIONS}

+${OBJECTDIR}/src/http/basicresponses.o: src/http/basicresponses.c 
+	${MKDIR} -p ${OBJECTDIR}/src/http
+	${RM} "$@.d"
+	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/basicresponses.o src/http/basicresponses.c
+
 ${OBJECTDIR}/src/http/http.o: src/http/http.c 
 	${MKDIR} -p ${OBJECTDIR}/src/http
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Wall -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/http.o src/http/http.c
+	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/http.o src/http/http.c

 ${OBJECTDIR}/src/http/request.o: src/http/request.c 
 	${MKDIR} -p ${OBJECTDIR}/src/http
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Wall -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/request.o src/http/request.c
+	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/request.o src/http/request.c

 ${OBJECTDIR}/src/main.o: src/main.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Wall -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c
+	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c

 ${OBJECTDIR}/src/socket.o: src/socket.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Wall -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/socket.o src/socket.c
+	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/socket.o src/socket.c

 # Subprojects
 .build-subprojects:
--- a/nbproject/Makefile-Release.mk
+++ b/nbproject/Makefile-Release.mk
@@ -35,6 +35,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}

 # Object Files
 OBJECTFILES= \
+	${OBJECTDIR}/src/http/basicresponses.o \
 	${OBJECTDIR}/src/http/http.o \
 	${OBJECTDIR}/src/http/request.o \
 	${OBJECTDIR}/src/main.o \
@@ -65,6 +66,11 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp ${OBJECTFILES} ${LDLIBSOPTIONS}

+${OBJECTDIR}/src/http/basicresponses.o: src/http/basicresponses.c 
+	${MKDIR} -p ${OBJECTDIR}/src/http
+	${RM} "$@.d"
+	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/basicresponses.o src/http/basicresponses.c
+
 ${OBJECTDIR}/src/http/http.o: src/http/http.c 
 	${MKDIR} -p ${OBJECTDIR}/src/http
 	${RM} "$@.d"
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -4,6 +4,7 @@
    <logicalFolder name="HeaderFiles"
                   displayName="Header Files"
                   projectFiles="true">
+      <itemPath>src/http/basicresponses.h</itemPath>
      <itemPath>src/http/http.h</itemPath>
      <itemPath>src/main.h</itemPath>
      <itemPath>src/http/request.h</itemPath>
@@ -16,6 +17,7 @@
    <logicalFolder name="SourceFiles"
                   displayName="Source Files"
                   projectFiles="true">
+      <itemPath>src/http/basicresponses.c</itemPath>
      <itemPath>src/http/http.c</itemPath>
      <itemPath>src/main.c</itemPath>
      <itemPath>src/http/request.c</itemPath>
@@ -32,6 +34,10 @@
                   kind="IMPORTANT_FILES_FOLDER">
      <itemPath>Makefile</itemPath>
    </logicalFolder>
+    <itemPath>content/responses/400.html</itemPath>
+    <itemPath>dist/Debug/GNU-Linux-x86/content/blah</itemPath>
+    <itemPath>content/error.html</itemPath>
+    <itemPath>content/test.txt</itemPath>
  </logicalFolder>
  <sourceRootList>
    <Elem>include</Elem>
@@ -47,9 +53,30 @@
      <compileType>
        <cTool>
          <standard>3</standard>
-          <warningLevel>2</warningLevel>
+          <commandLine>-O0</commandLine>
+          <warningLevel>3</warningLevel>
        </cTool>
+        <linkerTool>
+          <linkerLibItems>
+            <linkerLibStdlibItem>PosixThreads</linkerLibStdlibItem>
+          </linkerLibItems>
+        </linkerTool>
      </compileType>
+      <item path="content/error.html" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="content/responses/400.html" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="content/test.txt" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="dist/Debug/GNU-Linux-x86/content/blah"
+            ex="false"
+            tool="3"
+            flavor2="0">
+      </item>
+      <item path="src/http/basicresponses.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/http/basicresponses.h" ex="false" tool="3" flavor2="0">
+      </item>
      <item path="src/http/http.c" ex="false" tool="0" flavor2="0">
      </item>
      <item path="src/http/http.h" ex="false" tool="3" flavor2="0">
@@ -87,6 +114,21 @@
          <developmentMode>5</developmentMode>
        </asmTool>
      </compileType>
+      <item path="content/error.html" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="content/responses/400.html" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="content/test.txt" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="dist/Debug/GNU-Linux-x86/content/blah"
+            ex="false"
+            tool="3"
+            flavor2="0">
+      </item>
+      <item path="src/http/basicresponses.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/http/basicresponses.h" ex="false" tool="3" flavor2="0">
+      </item>
      <item path="src/http/http.c" ex="false" tool="0" flavor2="0">
      </item>
      <item path="src/http/http.h" ex="false" tool="3" flavor2="0">
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -7,14 +7,17 @@
    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
        <group>
-            <file>file:/home/sam/NetBeansProjects/KHttp/src/socket.c</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/http.h</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/src/ut/utarray.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/main.h</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/Makefile</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/request.h</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/content/error.html</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/basicresponses.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/main.c</file>
-            <file>file:/home/sam/NetBeansProjects/KHttp/src/socket.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/request.c</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/http.c</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/basicresponses.c</file>
        </group>
    </open-files>
 </project-private>