Excluded YASSL from default Windows and Mac builds

Updated images with transparencies

LICENSE.md5

@@ -1,26 +0,0 @@
-
-With regard to md5.c and md5.h
-
-/*
-  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */

LICENSE.sqlite3

@@ -1,3 +0,0 @@
-http://www.sqlite.org/copyright.html
-
-All of the code and documentation in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.

Makefile

@@ -40,7 +40,20 @@ ifneq ($(OS), Windows_NT)
   LUA_FLAGS += -DLUA_USE_DLOPEN
 endif
 
-# Stock windows binary builds with Lua and YASSL library.
+LIB_SOURCES = civetweb.c md5.c 
+
+ALL_SOURCES = main.c $(LIB_SOURCES) build/sqlite3.c build/lsqlite3.c \
+              $(LUA_SOURCES) $(YASSL_SOURCES)
+
+SQLITE_FLAGS = -DTHREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
+CIVETWEB_FLAGS = -DUSE_LUA -DUSE_LUA_SQLITE3 $(COPT)
+FLAGS = $(CIVETWEB_FLAGS) $(SQLITE_FLAGS) $(LUA_FLAGS)
+
+
+# Stock windows binary builds with Lua. 
+# Yassl has a GPL license, so we will leave it out by default.
+
+ifeq ($(WITH_YASSL), 1)
 YASSL       = ../cyassl-2.4.6
 YASSL_FLAGS = -I $(YASSL) -I $(YASSL)/cyassl \
               -D _LIB -D OPENSSL_EXTRA -D HAVE_ERRNO_H \
@@ -64,18 +77,19 @@ YASSL_SOURCES = \
   $(YASSL)/ctaocrypt/src/tfm.c $(YASSL)/ctaocrypt/src/integer.c \
   $(YASSL)/ctaocrypt/src/ecc.c $(YASSL)/src/ocsp.c $(YASSL)/src/crl.c \
   $(YASSL)/ctaocrypt/src/hc128.c $(YASSL)/ctaocrypt/src/memory.c
+  
+  ALL_SOURCES += $(YASSL_SOURCES)
+  FLAGS += $(YASSL_FLAGS) -DNO_SSL_DL
+  CIVETWEB_FLAGS += -DNO_SSL_DL 
+
+else
+#  FLAGS += -DNO_SSL
+#  CIVETWEB_FLAGS += -DNO_SSL 
+endif
 
-LIB_SOURCES = civetweb.c md5.c 
-
-ALL_SOURCES = main.c $(LIB_SOURCES) build/sqlite3.c build/lsqlite3.c \
-              $(LUA_SOURCES) $(YASSL_SOURCES)
 ALL_OBJECTS = $(ALL_SOURCES:%.c=%.o)
 ALL_WINOBJS = $(ALL_SOURCES:%.c=%.obj)
 
-SQLITE_FLAGS = -DTHREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-CIVETWEB_FLAGS = -DNO_SSL_DL -DUSE_LUA -DUSE_LUA_SQLITE3 $(COPT)
-
-FLAGS = $(CIVETWEB_FLAGS) $(SQLITE_FLAGS) $(YASSL_FLAGS) $(LUA_FLAGS)
 
 # Using Visual Studio 6.0. To build Civetweb:
 #  Set MSVC variable below to where VS 6.0 is installed on your system
@@ -139,7 +153,7 @@ Civetweb: $(LIB_SOURCES) main.c
           -framework Cocoa -ObjC -arch i386 -arch x86_64 -o Civetweb
 
 cocoa: Civetweb
-	V=`perl -lne '/define\s+CIVETWEB_VERSION\s+"(\S+)"/ and print $$1' $(LIB_SOURCES)`; DIR=dmg/Civetweb.app && rm -rf $$DIR && mkdir -p $$DIR/Contents/{MacOS,Resources} && install -m 644 build/civetweb_*.png $$DIR/Contents/Resources/ && install -m 644 build/Info.plist $$DIR/Contents/ && install -m 755 Civetweb $$DIR/Contents/MacOS/ && ln -fs /Applications dmg/ ; hdiutil create Civetweb_$$V.dmg -volname "Civetweb $$V" -srcfolder dmg -ov #; rm -rf dmg
+	V=`perl -lne '/define\s+CIVETWEB_VERSION\s+"(\S+)"/ and print $$1' $(LIB_SOURCES)`; DIR=dmg/Civetweb.app && rm -rf $$DIR && mkdir -p $$DIR/Contents/{MacOS,Resources} && install -m 644 build/civetweb_*.png build/civetweb.icns $$DIR/Contents/Resources/ && install -m 644 build/Info.plist $$DIR/Contents/ && install -m 755 Civetweb $$DIR/Contents/MacOS/ && ln -fs /Applications dmg/ ; hdiutil create Civetweb_$$V.dmg -volname "Civetweb $$V" -srcfolder dmg -ov #; rm -rf dmg
 
 un:
 	$(CC) test/unit_test.c -o unit_test -I. -I$(LUA) $(LUA_SOURCES) \

build/Info.plist

@@ -5,6 +5,7 @@
   <key>CFBundleExecutable</key> <string>Civetweb</string>
   <key>CFBundlePackageType</key> <string>APPL</string>
   <key>CFBundleTypeRole</key> <string>None</string>
+  <key>CFBundleIconFile</key> <string>civetweb</string>
   <key>CFBundleIconFiles</key> <array>
     <string>civetweb_16x16.png</string>
     <string>civetweb_22x22.png</string>
@@ -13,7 +14,7 @@
   </array>
   <key>LSUIElement</key> <true/>
   <key>RunAtLoad</key> <true/>
-  <key>Label</key> <string>com.kolkin.civetweb</string>
+  <key>Label</key> <string>com.nofacepress.civetweb</string>
   <key>ProgramArguments</key> <array> </array>
   <key>KeepAlive</key> <true/>
 </dict>

build/VS2012/Civetweb/civetweb/civetweb.vcxproj

@@ -27,7 +27,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v110</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

build/VS2012/Civetweb/civetweb_lua/civetweb_lua.vcxproj

@@ -27,7 +27,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v110</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

civetweb.c

@@ -251,7 +251,7 @@ typedef int SOCKET;
 
 #include "civetweb.h"
 
-#define CIVETWEB_VERSION "1.0"
+#define CIVETWEB_VERSION "1.1"
 #define PASSWORDS_FILE_NAME ".htpasswd"
 #define CGI_ENVIRONMENT_SIZE 4096
 #define MAX_CGI_ENVIR_VARS 64