Fix previous commit with merge errors

CREDITS.md

@@ -1,10 +1,7 @@
 # Civitweb Contributors
 
-<<<<<<< HEAD
-=======
 * apkbox
 * bel2125
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 * Daniel Oaks
 * F-Secure Corporation
 * grenclave
@@ -12,10 +9,7 @@
 * Kimmo Mustonen
 * Morgan McGuire
 * No Face Press
-<<<<<<< HEAD
-=======
 * Paul Sokolovsky
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 * Thomas Davis
 * William Greathouse
 

LICENSE.md

@@ -96,8 +96,6 @@ lsqlite3 License
 > TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     
 > SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                
 
-<<<<<<< HEAD
-=======
 Lua File System License
 ------
 
@@ -113,4 +111,3 @@ http://keplerproject.github.io/luafilesystem/license.html
 > 
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3

Makefile.deprecated

@@ -42,19 +42,11 @@ endif
 
 LIB_SOURCES = src/civetweb.c
 
-<<<<<<< HEAD
-ALL_SOURCES = src/main.c $(LIB_SOURCES) src/third_party/sqlite3.c src/third_party/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)
-=======
 ALL_SOURCES = src/main.c $(LIB_SOURCES) src/third_party/sqlite3.c src/third_party/lsqlite3.c src/third_party/lfs.c \
               $(LUA_SOURCES) $(YASSL_SOURCES)
 
 SQLITE_FLAGS = -DTHREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
 CIVETWEB_FLAGS = -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM $(COPT)
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 FLAGS = $(CIVETWEB_FLAGS) $(SQLITE_FLAGS) $(LUA_FLAGS)
 
 
@@ -155,11 +147,7 @@ $(PROG).lib: $(ALL_WINOBJS)
 # security unlock ~/Library/Keychains/login.keychain
 # See e.g. http://lists.apple.com/archives/apple-cdsa/2008/Jan/msg00027.html
 Civetweb: $(LIB_SOURCES) src/main.c
-<<<<<<< HEAD
-	$(CC) $(LIB_SOURCES) src/main.c src/third_party/lsqlite3.c src/third_party/sqlite3.c \
-=======
 	$(CC) $(LIB_SOURCES) src/main.c src/third_party/lsqlite3.c src/third_party/sqlite3.c src/third_party/lfs.c \
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
           -DUSE_COCOA $(CFLAGS) $(FLAGS) -mmacosx-version-min=10.4 \
           $(YASSL_SOURCES) $(LUA_SOURCES) \
           -framework Cocoa -ObjC -arch i386 -arch x86_64 -o Civetweb

RELEASE_NOTES.md

@@ -6,8 +6,6 @@ In planning.
 Changes
 -------
 
-<<<<<<< HEAD
-=======
 - Fixes page violation in mod_lua.inl (apkbox)
 - Use C style comments to enable compiling most of civetweb with -ansi. (F-Secure Corporation)
 - Allow directories with non ASCII characters in Windows in UTF-8 encoded (bel2125)
@@ -17,7 +15,6 @@ Changes
 - Updated of MIME types (bel2125)
 - Updated lsqlite (bel2125)
 - Fixed master thread priority (bel2125)
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 - Fixed IPV6 defines under Windowe (grenclave)
 - Fixed potential dead lock in connection_close() (Morgan McGuire)
 - Added WebSocket example using asynchronous server messages (William Greathouse)

VS2012/civetweb_lua/civetweb_lua.vcxproj

@@ -27,10 +27,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-<<<<<<< HEAD
-    <PlatformToolset>v110</PlatformToolset>
-=======
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -42,10 +38,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-<<<<<<< HEAD
-    <PlatformToolset>v110</PlatformToolset>
-=======
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -94,11 +86,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-<<<<<<< HEAD
-      <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-=======
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -112,11 +100,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-<<<<<<< HEAD
-      <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-=======
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -132,11 +116,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-<<<<<<< HEAD
-      <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-=======
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -154,11 +134,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-<<<<<<< HEAD
-      <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-=======
       <PreprocessorDefinitions>LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>

VS2012/lua_lib/lua_lib.vcxproj

@@ -27,10 +27,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-<<<<<<< HEAD
-    <PlatformToolset>v110</PlatformToolset>
-=======
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -42,10 +38,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-<<<<<<< HEAD
-    <PlatformToolset>v110</PlatformToolset>
-=======
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -149,10 +141,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-<<<<<<< HEAD
-=======
     <ClCompile Include="..\..\src\third_party\lfs.c" />
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     <ClCompile Include="..\..\src\third_party\lua-5.2.2\src\lapi.c" />
     <ClCompile Include="..\..\src\third_party\lua-5.2.2\src\lauxlib.c" />
     <ClCompile Include="..\..\src\third_party\lua-5.2.2\src\lbaselib.c" />
@@ -189,10 +178,7 @@
     <ClCompile Include="..\..\src\third_party\sqlite3.c" />
   </ItemGroup>
   <ItemGroup>
-<<<<<<< HEAD
-=======
     <ClInclude Include="..\..\src\third_party\lfs.h" />
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     <ClInclude Include="..\..\src\third_party\sqlite3.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

VS2012/lua_lib/lua_lib.vcxproj.filters

@@ -117,22 +117,16 @@
     <ClCompile Include="..\..\src\third_party\sqlite3.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-<<<<<<< HEAD
-=======
     <ClCompile Include="..\..\src\third_party\lfs.c">
       <Filter>Source Files</Filter>
     </ClCompile>
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\third_party\sqlite3.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-<<<<<<< HEAD
-=======
     <ClInclude Include="..\..\src\third_party\lfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
   </ItemGroup>
 </Project>

docs/Embedding.md

@@ -59,10 +59,7 @@ Lua is a server side include functionality.  Files ending in .la will be process
   - -DLUA_COMPAT_ALL
   - -DUSE_LUA
   - -DUSE_LUA_SQLITE3
-<<<<<<< HEAD
-=======
   - -DUSE_LUA_FILE_SYSTEM
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
 ##### Add the following sources
 
@@ -103,11 +100,8 @@ Lua is a server side include functionality.  Files ending in .la will be process
   - src/third_party/sqlite3.c
   - src/third_party/sqlite3.h
   - src/third_party/lsqlite3.c
-<<<<<<< HEAD
-=======
   - src/third_party/lfs.c
   - src/third_party/lfs.h
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
 
 Civetweb internals

include/civetweb.h

@@ -1,24 +1,3 @@
-<<<<<<< HEAD
-// Copyright (c) 2004-2012 Sergey Lyubka
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-=======
 /* Copyright (c) 2004-2013 Sergey Lyubka
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -39,7 +18,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
 #ifndef CIVETWEB_HEADER_INCLUDED
 #define CIVETWEB_HEADER_INCLUDED
@@ -49,138 +27,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-<<<<<<< HEAD
-#endif // __cplusplus
-
-struct mg_context;     // Handle for the HTTP service itself
-struct mg_connection;  // Handle for the individual connection
-
-
-// This structure contains information about the HTTP request.
-struct mg_request_info {
-    const char *request_method; // "GET", "POST", etc
-    const char *uri;            // URL-decoded URI
-    const char *http_version;   // E.g. "1.0", "1.1"
-    const char *query_string;   // URL part after '?', not including '?', or NULL
-    const char *remote_user;    // Authenticated user, or NULL if no auth used
-    long remote_ip;             // Client's IP address
-    int remote_port;            // Client's port
-    int is_ssl;                 // 1 if SSL-ed, 0 if not
-    void *user_data;            // User data pointer passed to mg_start()
-    void *conn_data;            // Connection-specific user data
-
-    int num_headers;            // Number of HTTP headers
-    struct mg_header {
-        const char *name;         // HTTP header name
-        const char *value;        // HTTP header value
-    } http_headers[64];         // Maximum 64 headers
-};
-
-
-// This structure needs to be passed to mg_start(), to let civetweb know
-// which callbacks to invoke. For detailed description, see
-// https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md
-struct mg_callbacks {
-    // Called when civetweb has received new HTTP request.
-    // If callback returns non-zero,
-    // callback must process the request by sending valid HTTP headers and body,
-    // and civetweb will not do any further processing.
-    // If callback returns 0, civetweb processes the request itself. In this case,
-    // callback must not send any data to the client.
-    int  (*begin_request)(struct mg_connection *);
-
-    // Called when civetweb has finished processing request.
-    void (*end_request)(const struct mg_connection *, int reply_status_code);
-
-    // Called when civetweb is about to log a message. If callback returns
-    // non-zero, civetweb does not log anything.
-    int  (*log_message)(const struct mg_connection *, const char *message);
-
-    // Called when civetweb initializes SSL library.
-    int  (*init_ssl)(void *ssl_context, void *user_data);
-
-    // Called when websocket request is received, before websocket handshake.
-    // If callback returns 0, civetweb proceeds with handshake, otherwise
-    // cinnection is closed immediately.
-    int (*websocket_connect)(const struct mg_connection *);
-
-    // Called when websocket handshake is successfully completed, and
-    // connection is ready for data exchange.
-    void (*websocket_ready)(struct mg_connection *);
-
-    // Called when data frame has been received from the client.
-    // Parameters:
-    //    bits: first byte of the websocket frame, see websocket RFC at
-    //          http://tools.ietf.org/html/rfc6455, section 5.2
-    //    data, data_len: payload, with mask (if any) already applied.
-    // Return value:
-    //    non-0: keep this websocket connection opened.
-    //    0:     close this websocket connection.
-    int  (*websocket_data)(struct mg_connection *, int bits,
-                           char *data, size_t data_len);
-
-    // Called when civetweb is closing a connection.  The per-context mutex is locked when this
-    // is invoked.  This is primarily useful for noting when a websocket is closing and removing it
-    // from any application-maintained list of clients.
-    void (*connection_close)(struct mg_connection *);
-
-    // Called when civetweb tries to open a file. Used to intercept file open
-    // calls, and serve file data from memory instead.
-    // Parameters:
-    //    path:     Full path to the file to open.
-    //    data_len: Placeholder for the file size, if file is served from memory.
-    // Return value:
-    //    NULL: do not serve file from memory, proceed with normal file open.
-    //    non-NULL: pointer to the file contents in memory. data_len must be
-    //              initilized with the size of the memory block.
-    const char * (*open_file)(const struct mg_connection *,
-                              const char *path, size_t *data_len);
-
-    // Called when civetweb is about to serve Lua server page (.lp file), if
-    // Lua support is enabled.
-    // Parameters:
-    //   lua_context: "lua_State *" pointer.
-    void (*init_lua)(struct mg_connection *, void *lua_context);
-
-    // Called when civetweb has uploaded a file to a temporary directory as a
-    // result of mg_upload() call.
-    // Parameters:
-    //    file_file: full path name to the uploaded file.
-    void (*upload)(struct mg_connection *, const char *file_name);
-
-    // Called when civetweb is about to send HTTP error to the client.
-    // Implementing this callback allows to create custom error pages.
-    // Parameters:
-    //   status: HTTP error status code.
-    int  (*http_error)(struct mg_connection *, int status);
-};
-
-// Start web server.
-//
-// Parameters:
-//   callbacks: mg_callbacks structure with user-defined callbacks.
-//   options: NULL terminated list of option_name, option_value pairs that
-//            specify Civetweb configuration parameters.
-//
-// Side-effects: on UNIX, ignores SIGCHLD and SIGPIPE signals. If custom
-//    processing is required for these, signal handlers must be set up
-//    after calling mg_start().
-//
-//
-// Example:
-//   const char *options[] = {
-//     "document_root", "/var/www",
-//     "listening_ports", "80,443s",
-//     NULL
-//   };
-//   struct mg_context *ctx = mg_start(&my_func, NULL, options);
-//
-// Refer to https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md
-// for the list of valid option and their possible values.
-//
-// Return:
-//   web server context, or NULL on error.
-=======
 #endif /* __cplusplus */
 
 struct mg_context;     /* Handle for the HTTP service itself */
@@ -315,81 +161,11 @@ struct mg_callbacks {
 
    Return:
      web server context, or NULL on error. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 struct mg_context *mg_start(const struct mg_callbacks *callbacks,
                             void *user_data,
                             const char **configuration_options);
 
 
-<<<<<<< HEAD
-// Stop the web server.
-//
-// Must be called last, when an application wants to stop the web server and
-// release all associated resources. This function blocks until all Civetweb
-// threads are stopped. Context pointer becomes invalid.
-void mg_stop(struct mg_context *);
-
-// mg_request_handler
-//
-// Called when a new request comes in.  This callback is URI based
-// and configured with mg_set_request_handler().
-//
-// Parameters:
-//    conn: current connection information.
-//    cbdata: the callback data configured with mg_set_request_handler().
-// Returns:
-//    0: the handler could not handle the request, so fall through.
-//    1: the handler processed the request.
-typedef int (* mg_request_handler)(struct mg_connection *conn, void *cbdata);
-
-// mg_set_request_handler
-//
-// Sets or removes a URI mapping for a request handler.
-//
-// URI's are ordered and prefixed URI's are supported. For example,
-// consider two URIs: /a/b and /a
-//         /a   matches /a
-//         /a/b matches /a/b
-//         /a/c matches /a
-//
-// Parameters:
-//    ctx: server context
-//    uri: the URI to configure
-//    handler: the callback handler to use when the URI is requested.
-//             If NULL, the URI will be removed.
-//    cbdata: the callback data to give to the handler when it s requested.
-void mg_set_request_handler(struct mg_context *ctx, const char *uri, mg_request_handler handler, void *cbdata);
-
-
-// Get the value of particular configuration parameter.
-// The value returned is read-only. Civetweb does not allow changing
-// configuration at run time.
-// If given parameter name is not valid, NULL is returned. For valid
-// names, return value is guaranteed to be non-NULL. If parameter is not
-// set, zero-length string is returned.
-const char *mg_get_option(const struct mg_context *ctx, const char *name);
-
-
-// Return array of strings that represent valid configuration options.
-// For each option, option name and default value is returned, i.e. the
-// number of entries in the array equals to number_of_options x 2.
-// Array is NULL terminated.
-const char **mg_get_valid_option_names(void);
-
-
-// Add, edit or delete the entry in the passwords file.
-//
-// This function allows an application to manipulate .htpasswd files on the
-// fly by adding, deleting and changing user records. This is one of the
-// several ways of implementing authentication on the server side. For another,
-// cookie-based way please refer to the examples/chat in the source tree.
-//
-// If password is not NULL, entry is added (or modified if already exists).
-// If password is NULL, entry is deleted.
-//
-// Return:
-//   1 on success, 0 on error.
-=======
 /* Stop the web server.
 
    Must be called last, when an application wants to stop the web server and
@@ -457,48 +233,12 @@ const char **mg_get_valid_option_names(void);
 
    Return:
      1 on success, 0 on error. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 int mg_modify_passwords_file(const char *passwords_file_name,
                              const char *domain,
                              const char *user,
                              const char *password);
 
 
-<<<<<<< HEAD
-// Return information associated with the request.
-struct mg_request_info *mg_get_request_info(struct mg_connection *);
-
-
-// Send data to the client.
-// Return:
-//  0   when the connection has been closed
-//  -1  on error
-//  >0  number of bytes written on success
-int mg_write(struct mg_connection *, const void *buf, size_t len);
-
-
-// Send data to a websocket client wrapped in a websocket frame.  Uses mg_lock to ensure
-// that the transmission is not interrupted, i.e., when the application is proactively
-// communicating and responding to a request simultaneously.
-//
-// Send data to a websocket client wrapped in a websocket frame.
-// This function is available when civetweb is compiled with -DUSE_WEBSOCKET
-//
-// Return:
-//  0   when the connection has been closed
-//  -1  on error
-//  >0  number of bytes written on success
-int mg_websocket_write(struct mg_connection* conn, int opcode,
-                       const char *data, size_t data_len);
-
-// Blocks until unique access is obtained to this connection. Intended for use with websockets only.
-// Invoke this before mg_write or mg_printf when communicating with a websocket if your code has
-// server-initiated communication as well as communication in direct response to a message.
-void mg_lock(struct mg_connection* conn);
-void mg_unlock(struct mg_connection* conn);
-
-// Opcodes, from http://tools.ietf.org/html/rfc6455
-=======
 /* Return information associated with the request. */
 struct mg_request_info *mg_get_request_info(struct mg_connection *);
 
@@ -535,7 +275,6 @@ void mg_lock(struct mg_connection* conn);
 void mg_unlock(struct mg_connection* conn);
 
 /* Opcodes, from http://tools.ietf.org/html/rfc6455 */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 enum {
     WEBSOCKET_OPCODE_CONTINUATION = 0x0,
     WEBSOCKET_OPCODE_TEXT = 0x1,
@@ -546,11 +285,7 @@ enum {
 };
 
 
-<<<<<<< HEAD
-// Macros for enabling compiler-specific checks for printf-like arguments.
-=======
 /* Macros for enabling compiler-specific checks for printf-like arguments. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 #undef PRINTF_FORMAT_STRING
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 #include <sal.h>
@@ -569,101 +304,13 @@ enum {
 #define PRINTF_ARGS(x, y)
 #endif
 
-<<<<<<< HEAD
-// Send data to the client using printf() semantics.
-//
-// Works exactly like mg_write(), but allows to do message formatting.
-=======
 /* Send data to the client using printf() semantics.
 
    Works exactly like mg_write(), but allows to do message formatting. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 int mg_printf(struct mg_connection *,
               PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3);
 
 
-<<<<<<< HEAD
-// Send contents of the entire file together with HTTP headers.
-void mg_send_file(struct mg_connection *conn, const char *path);
-
-
-// Read data from the remote end, return number of bytes read.
-// Return:
-//   0     connection has been closed by peer. No more data could be read.
-//   < 0   read error. No more data could be read from the connection.
-//   > 0   number of bytes read into the buffer.
-int mg_read(struct mg_connection *, void *buf, size_t len);
-
-
-// Get the value of particular HTTP header.
-//
-// This is a helper function. It traverses request_info->http_headers array,
-// and if the header is present in the array, returns its value. If it is
-// not present, NULL is returned.
-const char *mg_get_header(const struct mg_connection *, const char *name);
-
-
-// Get a value of particular form variable.
-//
-// Parameters:
-//   data: pointer to form-uri-encoded buffer. This could be either POST data,
-//         or request_info.query_string.
-//   data_len: length of the encoded data.
-//   var_name: variable name to decode from the buffer
-//   dst: destination buffer for the decoded variable
-//   dst_len: length of the destination buffer
-//
-// Return:
-//   On success, length of the decoded variable.
-//   On error:
-//      -1 (variable not found).
-//      -2 (destination buffer is NULL, zero length or too small to hold the
-//          decoded variable).
-//
-// Destination buffer is guaranteed to be '\0' - terminated if it is not
-// NULL or zero length.
-int mg_get_var(const char *data, size_t data_len,
-               const char *var_name, char *dst, size_t dst_len);
-
-// Get a value of particular form variable.
-//
-// Parameters:
-//   data: pointer to form-uri-encoded buffer. This could be either POST data,
-//         or request_info.query_string.
-//   data_len: length of the encoded data.
-//   var_name: variable name to decode from the buffer
-//   dst: destination buffer for the decoded variable
-//   dst_len: length of the destination buffer
-//   occurrence: which occurrence of the variable, 0 is the first, 1 the second...
-//              this makes it possible to parse a query like
-//              b=x&a=y&a=z which will have occurrence values b:0, a:0 and a:1
-//
-// Return:
-//   On success, length of the decoded variable.
-//   On error:
-//      -1 (variable not found).
-//      -2 (destination buffer is NULL, zero length or too small to hold the
-//          decoded variable).
-//
-// Destination buffer is guaranteed to be '\0' - terminated if it is not
-// NULL or zero length.
-int mg_get_var2(const char *data, size_t data_len,
-                const char *var_name, char *dst, size_t dst_len, size_t occurrence);
-
-// Fetch value of certain cookie variable into the destination buffer.
-//
-// Destination buffer is guaranteed to be '\0' - terminated. In case of
-// failure, dst[0] == '\0'. Note that RFC allows many occurrences of the same
-// parameter. This function returns only first occurrence.
-//
-// Return:
-//   On success, value length.
-//   On error:
-//      -1 (either "Cookie:" header is not present at all or the requested
-//          parameter is not found).
-//      -2 (destination buffer is NULL, zero length or too small to hold the
-//          value).
-=======
 /* Send contents of the entire file together with HTTP headers. */
 void mg_send_file(struct mg_connection *conn, const char *path);
 
@@ -745,27 +392,10 @@ int mg_get_var2(const char *data, size_t data_len,
             parameter is not found).
         -2 (destination buffer is NULL, zero length or too small to hold the
             value). */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 int mg_get_cookie(const char *cookie, const char *var_name,
                   char *buf, size_t buf_len);
 
 
-<<<<<<< HEAD
-// Download data from the remote web server.
-//   host: host name to connect to, e.g. "foo.com", or "10.12.40.1".
-//   port: port number, e.g. 80.
-//   use_ssl: wether to use SSL connection.
-//   error_buffer, error_buffer_size: error message placeholder.
-//   request_fmt,...: HTTP request.
-// Return:
-//   On success, valid pointer to the new connection, suitable for mg_read().
-//   On error, NULL. error_buffer contains error message.
-// Example:
-//   char ebuf[100];
-//   struct mg_connection *conn;
-//   conn = mg_download("google.com", 80, 0, ebuf, sizeof(ebuf),
-//                      "%s", "GET / HTTP/1.0\r\nHost: google.com\r\n\r\n");
-=======
 /* Download data from the remote web server.
      host: host name to connect to, e.g. "foo.com", or "10.12.40.1".
      port: port number, e.g. 80.
@@ -781,27 +411,12 @@ int mg_get_cookie(const char *cookie, const char *var_name,
      conn = mg_download("google.com", 80, 0, ebuf, sizeof(ebuf),
                         "%s", "GET / HTTP/1.0\r\nHost: google.com\r\n\r\n");
  */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 struct mg_connection *mg_download(const char *host, int port, int use_ssl,
                                   char *error_buffer, size_t error_buffer_size,
                                   PRINTF_FORMAT_STRING(const char *request_fmt),
                                   ...) PRINTF_ARGS(6, 7);
 
 
-<<<<<<< HEAD
-// Close the connection opened by mg_download().
-void mg_close_connection(struct mg_connection *conn);
-
-
-// File upload functionality. Each uploaded file gets saved into a temporary
-// file and MG_UPLOAD event is sent.
-// Return number of uploaded files.
-int mg_upload(struct mg_connection *conn, const char *destination_dir);
-
-
-// Convenience function -- create detached thread.
-// Return: 0 on success, non-0 on error.
-=======
 /* Close the connection opened by mg_download(). */
 void mg_close_connection(struct mg_connection *conn);
 
@@ -814,55 +429,10 @@ int mg_upload(struct mg_connection *conn, const char *destination_dir);
 
 /* Convenience function -- create detached thread.
    Return: 0 on success, non-0 on error. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 typedef void * (*mg_thread_func_t)(void *);
 int mg_start_thread(mg_thread_func_t f, void *p);
 
 
-<<<<<<< HEAD
-// Return builtin mime type for the given file name.
-// For unrecognized extensions, "text/plain" is returned.
-const char *mg_get_builtin_mime_type(const char *file_name);
-
-
-// Return Civetweb version.
-const char *mg_version(void);
-
-// URL-decode input buffer into destination buffer.
-// 0-terminate the destination buffer.
-// form-url-encoded data differs from URI encoding in a way that it
-// uses '+' as character for space, see RFC 1866 section 8.2.1
-// http://ftp.ics.uci.edu/pub/ietf/html/rfc1866.txt
-// Return: length of the decoded data, or -1 if dst buffer is too small.
-int mg_url_decode(const char *src, int src_len, char *dst,
-                  int dst_len, int is_form_url_encoded);
-
-// URL-encode input buffer into destination buffer.
-// returns the length of the resulting buffer or -1
-// is the buffer is too small.
-int mg_url_encode(const char *src, char *dst, size_t dst_len);
-
-// MD5 hash given strings.
-// Buffer 'buf' must be 33 bytes long. Varargs is a NULL terminated list of
-// ASCIIz strings. When function returns, buf will contain human-readable
-// MD5 hash. Example:
-//   char buf[33];
-//   mg_md5(buf, "aa", "bb", NULL);
-char *mg_md5(char buf[33], ...);
-
-
-// Print error message to the opened error log stream.
-// This utilizes the provided logging configuration.
-//   conn: connection
-//   fmt: format string without the line return
-//   ...: variable argument list
-// Example:
-//   mg_cry(conn,"i like %s", "logging");
-void mg_cry(struct mg_connection *conn,
-            PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3);
-
-// utility method to compare two buffers, case incensitive.
-=======
 /* Return builtin mime type for the given file name.
    For unrecognized extensions, "text/plain" is returned. */
 const char *mg_get_builtin_mime_type(const char *file_name);
@@ -905,17 +475,10 @@ void mg_cry(struct mg_connection *conn,
             PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3);
 
 /* utility method to compare two buffers, case incensitive. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 int mg_strncasecmp(const char *s1, const char *s2, size_t len);
 
 #ifdef __cplusplus
 }
-<<<<<<< HEAD
-#endif // __cplusplus
-
-#endif // CIVETWEB_HEADER_INCLUDED
-=======
 #endif /* __cplusplus */
 
 #endif /* CIVETWEB_HEADER_INCLUDED */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3

resources/Makefile.in-lua

@@ -48,11 +48,6 @@ SQLITE_SOURCES = $(addprefix $(SQLITE_DIR)/, $(SQLITE_SOURCE_FILES))
 SQLITE_OBJECTS = $(SQLITE_SOURCES:.c=.o)
 SQLITE_CFLAGS = -I$(SQLITE_DIR) -DTHREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
 
-<<<<<<< HEAD
-OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS)
-CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3
-SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) 
-=======
 LFS_DIR = src/third_party
 LFS_SOURCE_FILES = lfs.c
 LFS_SOURCES = $(addprefix $(LFS_DIR)/, $(LFS_SOURCE_FILES))
@@ -63,5 +58,4 @@ LFS_CFLAGS = -I$(LFS_DIR)
 OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS)
 CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM
 SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR)
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 

src/main.c

@@ -1,29 +1,3 @@
-<<<<<<< HEAD
-// Copyright (c) 2004-2013 Sergey Lyubka
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#if defined(_WIN32)
-#define _CRT_SECURE_NO_WARNINGS  // Disable deprecation warning in VS2005
-#else
-#define _XOPEN_SOURCE 600  // For PATH_MAX on linux
-=======
 /* Copyright (c) 2004-2013 Sergey Lyubka
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -49,7 +23,6 @@
 #define _CRT_SECURE_NO_WARNINGS  /* Disable deprecation warning in VS2005 */
 #else
 #define _XOPEN_SOURCE 600  /* For PATH_MAX on linux */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 #endif
 
 #ifndef IGNORE_UNUSED_RESULT
@@ -97,36 +70,22 @@ extern char *_getcwd(char *buf, size_t size);
 #define DIRSEP '/'
 #define WINCDECL
 #define abs_path(rel, abs, abs_size) realpath((rel), (abs))
-<<<<<<< HEAD
-#endif // _WIN32
-=======
 #endif /* _WIN32 */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
 #define MAX_OPTIONS 100
 #define MAX_CONF_FILE_LINE_SIZE (8 * 1024)
 
 static int exit_flag;
-<<<<<<< HEAD
-static char server_name[40];        // Set by init_server_name()
-static char config_file[PATH_MAX] = "";  // Set by process_command_line_arguments()
-static struct mg_context *ctx;      // Set by start_civetweb()
-=======
 static char server_name[40];        /* Set by init_server_name() */
 static char config_file[PATH_MAX] = ""; /* Set by
                                            process_command_line_arguments() */
 static struct mg_context *ctx;      /* Set by start_civetweb() */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
 #if !defined(CONFIG_FILE)
 #define CONFIG_FILE "civetweb.conf"
 #endif /* !CONFIG_FILE */
 
-<<<<<<< HEAD
-// backup config file
-=======
 /* backup config file */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 #if !defined(CONFIG_FILE2) && defined(LINUX)
 #define CONFIG_FILE2 "/usr/local/etc/civetweb.conf"
 #endif
@@ -210,11 +169,7 @@ static void create_config_file(const char *path)
     FILE *fp;
     int i;
 
-<<<<<<< HEAD
-    // Create config file if it is not present yet
-=======
     /* Create config file if it is not present yet */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     if ((fp = fopen(path, "r")) != NULL) {
         fclose(fp);
     } else if ((fp = fopen(path, "a+")) != NULL) {
@@ -269,20 +224,12 @@ static void process_command_line_arguments(char *argv[], char **options)
     FILE *fp = NULL;
     size_t i, cmd_line_opts_start = 1, line_no = 0;
 
-<<<<<<< HEAD
-    // Should we use a config file ?
-=======
     /* Should we use a config file ? */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     if (argv[1] != NULL && argv[1][0] != '-') {
         snprintf(config_file, sizeof(config_file), "%s", argv[1]);
         cmd_line_opts_start = 2;
     } else if ((p = strrchr(argv[0], DIRSEP)) == NULL) {
-<<<<<<< HEAD
-        // No command line flags specified. Look where binary lives
-=======
         /* No command line flags specified. Look where binary lives */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         snprintf(config_file, sizeof(config_file)-1, "%s", CONFIG_FILE);
         config_file[sizeof(config_file)-1] = 0;
     } else {
@@ -293,21 +240,13 @@ static void process_command_line_arguments(char *argv[], char **options)
 
     fp = fopen(config_file, "r");
 
-<<<<<<< HEAD
-    // If config file was set in command line and open failed, die
-=======
     /* If config file was set in command line and open failed, die */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     if (cmd_line_opts_start == 2 && fp == NULL) {
         die("Cannot open config file %s: %s", config_file, strerror(errno));
     }
 
 #ifdef CONFIG_FILE2
-<<<<<<< HEAD
-    // try alternate config file
-=======
     /* try alternate config file */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     if (fp == NULL) {
         fp = fopen(CONFIG_FILE2, "r");
         if (fp != NULL) {
@@ -316,25 +255,6 @@ static void process_command_line_arguments(char *argv[], char **options)
     }
 #endif
 
-<<<<<<< HEAD
-    // Load config file settings first
-    if (fp != NULL) {
-        fprintf(stderr, "Loading config file %s\n", config_file);
-
-        // Loop over the lines in config file
-        while (fgets(line, sizeof(line), fp) != NULL) {
-            line_no++;
-
-            // Ignore empty lines and comments
-            for (i = 0; isspace(* (unsigned char *) &line[i]); ) i++;
-            if (line[i] == '#' || line[i] == '\0') {
-                continue;
-            }
-
-            if (sscanf(line, "%s %[^\r\n#]", opt, val) != 2) {
-                printf("%s: line %d is invalid, ignoring it:\n %s",
-                       config_file, (int) line_no, line);
-=======
     /* Load config file settings first */
     if (fp != NULL) {
         fprintf(stderr, "Loading config file %s\n", config_file);
@@ -359,7 +279,6 @@ static void process_command_line_arguments(char *argv[], char **options)
             if (sscanf(p, "%s %[^\r\n#]", opt, val) != 2) {
                 printf("%s: line %d is invalid, ignoring it:\n %s",
                        config_file, (int) line_no, p);
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
             } else {
                 set_option(options, opt, val);
             }
@@ -368,21 +287,12 @@ static void process_command_line_arguments(char *argv[], char **options)
         (void) fclose(fp);
     }
 
-<<<<<<< HEAD
-    // If we're under MacOS and started by launchd, then the second
-    // argument is process serial number, -psn_.....
-    // In this case, don't process arguments at all.
-    if (argv[1] == NULL || memcmp(argv[1], "-psn_", 5) != 0) {
-        // Handle command line flags.
-        // They override config file and default settings.
-=======
     /* If we're under MacOS and started by launchd, then the second
        argument is process serial number, -psn_.....
        In this case, don't process arguments at all. */
     if (argv[1] == NULL || memcmp(argv[1], "-psn_", 5) != 0) {
         /* Handle command line flags.
            They override config file and default settings. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         for (i = cmd_line_opts_start; argv[i] != NULL; i += 2) {
             if (argv[i][0] != '-' || argv[i + 1] == NULL) {
                 show_usage_and_exit();
@@ -409,14 +319,9 @@ static int is_path_absolute(const char *path)
 {
 #ifdef _WIN32
     return path != NULL &&
-<<<<<<< HEAD
-           ((path[0] == '\\' && path[1] == '\\') ||  // UNC path, e.g. \\server\dir
-            (isalpha(path[0]) && path[1] == ':' && path[2] == '\\'));  // E.g. X:\dir
-=======
            ((path[0] == '\\' && path[1] == '\\') ||  /* UNC path, e.g.
                                                         \\server\dir */
             (isalpha(path[0]) && path[1] == ':' && path[2] == '\\'));  /* E.g. X:\dir */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 #else
     return path != NULL && path[0] == '/';
 #endif
@@ -439,8 +344,6 @@ static void verify_existence(char **options, const char *option_name,
     struct stat st;
     const char *path = get_option(options, option_name);
 
-<<<<<<< HEAD
-=======
 #ifdef _WIN32
     wchar_t wbuf[1024];
     char mbbuf[1024];
@@ -455,7 +358,6 @@ static void verify_existence(char **options, const char *option_name,
     }
 #endif
 
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     if (path != NULL && (stat(path, &st) != 0 ||
                          ((S_ISDIR(st.st_mode) ? 1 : 0) != must_be_dir))) {
         die("Invalid path for %s: [%s]: (%s). Make sure that path is either "
@@ -470,17 +372,6 @@ static void set_absolute_path(char *options[], const char *option_name,
     char path[PATH_MAX] = "", abs[PATH_MAX] = "", *option_value;
     const char *p;
 
-<<<<<<< HEAD
-    // Check whether option is already set
-    option_value = get_option(options, option_name);
-
-    // If option is already set and it is an absolute path,
-    // leave it as it is -- it's already absolute.
-    if (option_value != NULL && !is_path_absolute(option_value)) {
-        // Not absolute. Use the directory where civetweb executable lives
-        // be the relative directory for everything.
-        // Extract civetweb executable directory into path.
-=======
     /* Check whether option is already set */
     option_value = get_option(options, option_name);
 
@@ -490,7 +381,6 @@ static void set_absolute_path(char *options[], const char *option_name,
         /* Not absolute. Use the directory where civetweb executable lives
            be the relative directory for everything.
            Extract civetweb executable directory into path. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         if ((p = strrchr(path_to_civetweb_exe, DIRSEP)) == NULL) {
             IGNORE_UNUSED_RESULT(getcwd(path, sizeof(path)));
         } else {
@@ -502,11 +392,7 @@ static void set_absolute_path(char *options[], const char *option_name,
         strncat(path, "/", sizeof(path) - 1);
         strncat(path, option_value, sizeof(path) - 1);
 
-<<<<<<< HEAD
-        // Absolutize the path, and set the option
-=======
         /* Absolutize the path, and set the option */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         IGNORE_UNUSED_RESULT(abs_path(path, abs, sizeof(abs)));
         set_option(options, option_name, abs);
     }
@@ -518,11 +404,7 @@ static void start_civetweb(int argc, char *argv[])
     char *options[MAX_OPTIONS];
     int i;
 
-<<<<<<< HEAD
-    // Edit passwords file if -A option is specified
-=======
     /* Edit passwords file if -A option is specified */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     if (argc > 1 && !strcmp(argv[1], "-A")) {
         if (argc != 6) {
             show_usage_and_exit();
@@ -531,11 +413,7 @@ static void start_civetweb(int argc, char *argv[])
              EXIT_SUCCESS : EXIT_FAILURE);
     }
 
-<<<<<<< HEAD
-    // Show usage if -h or --help options are specified
-=======
     /* Show usage if -h or --help options are specified */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     if (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))) {
         show_usage_and_exit();
     }
@@ -543,17 +421,10 @@ static void start_civetweb(int argc, char *argv[])
     options[0] = NULL;
     set_option(options, "document_root", ".");
 
-<<<<<<< HEAD
-    // Update config based on command line arguments
-    process_command_line_arguments(argv, options);
-
-    // Make sure we have absolute paths for files and directories
-=======
     /* Update config based on command line arguments */
     process_command_line_arguments(argv, options);
 
     /* Make sure we have absolute paths for files and directories */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     set_absolute_path(options, "document_root", argv[0]);
     set_absolute_path(options, "put_delete_auth_file", argv[0]);
     set_absolute_path(options, "cgi_interpreter", argv[0]);
@@ -562,28 +433,16 @@ static void start_civetweb(int argc, char *argv[])
     set_absolute_path(options, "global_auth_file", argv[0]);
     set_absolute_path(options, "ssl_certificate", argv[0]);
 
-<<<<<<< HEAD
-    // Make extra verification for certain options
-=======
     /* Make extra verification for certain options */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     verify_existence(options, "document_root", 1);
     verify_existence(options, "cgi_interpreter", 0);
     verify_existence(options, "ssl_certificate", 0);
 
-<<<<<<< HEAD
-    // Setup signal handler: quit on Ctrl-C
-    signal(SIGTERM, signal_handler);
-    signal(SIGINT, signal_handler);
-
-    // Start Civetweb
-=======
     /* Setup signal handler: quit on Ctrl-C */
     signal(SIGTERM, signal_handler);
     signal(SIGINT, signal_handler);
 
     /* Start Civetweb */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     memset(&callbacks, 0, sizeof(callbacks));
     callbacks.log_message = &log_message;
     ctx = mg_start(&callbacks, NULL, (const char **) options);
@@ -602,15 +461,6 @@ enum {
     ID_REMOVE_SERVICE, ID_STATIC, ID_GROUP, ID_SAVE, ID_RESET_DEFAULTS,
     ID_STATUS, ID_CONNECT,
 
-<<<<<<< HEAD
-    // All dynamically created text boxes for options have IDs starting from
-    // ID_CONTROLS, incremented by one.
-    ID_CONTROLS = 200,
-
-    // Text boxes for files have "..." buttons to open file browser. These
-    // buttons have IDs that are ID_FILE_BUTTONS_DELTA higher than associated
-    // text box ID.
-=======
     /* All dynamically created text boxes for options have IDs starting from
        ID_CONTROLS, incremented by one. */
     ID_CONTROLS = 200,
@@ -618,7 +468,6 @@ enum {
     /* Text boxes for files have "..." buttons to open file browser. These
        buttons have IDs that are ID_FILE_BUTTONS_DELTA higher than associated
        text box ID. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     ID_FILE_BUTTONS_DELTA = 1000
 };
 static HICON hIcon;
@@ -719,11 +568,7 @@ static void save_config(HWND hDlg, FILE *fp)
             GetDlgItemText(hDlg, id, value, sizeof(value));
         }
         default_value = options[i * 2 + 1] == NULL ? "" : options[i * 2 + 1];
-<<<<<<< HEAD
-        // If value is the same as default, skip it
-=======
         /* If value is the same as default, skip it */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         if (strcmp(value, default_value) != 0) {
             fprintf(fp, "%s %s\n", name, value);
         }
@@ -873,11 +718,7 @@ static void show_settings_dialog()
     static int guard;
 
     static struct {
-<<<<<<< HEAD
-        DLGTEMPLATE template; // 18 bytes
-=======
         DLGTEMPLATE template; /* 18 bytes */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         WORD menu, class;
         wchar_t caption[1];
         WORD fontsiz;
@@ -958,11 +799,7 @@ static int manage_service(int action)
     static const char *service_name = "Civetweb";
     SC_HANDLE hSCM = NULL, hService = NULL;
     SERVICE_DESCRIPTION descr = {server_name};
-<<<<<<< HEAD
-    char path[PATH_MAX + 20] = "";  // Path to executable plus magic argument
-=======
     char path[PATH_MAX + 20] = "";/* Path to executable plus magic argument */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     int success = 1;
 
     if ((hSCM = OpenSCManager(NULL, NULL, action == ID_INSTALL_SERVICE ?
@@ -1012,11 +849,7 @@ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
     char buf[200], *service_argv[] = {__argv[0], NULL};
     POINT pt;
     HMENU hMenu;
-<<<<<<< HEAD
-    static UINT s_uTaskbarRestart; // for taskbar creation
-=======
     static UINT s_uTaskbarRestart; /* for taskbar creation */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
     switch (msg) {
     case WM_CREATE:
@@ -1085,11 +918,7 @@ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
         mg_stop(ctx);
         Shell_NotifyIcon(NIM_DELETE, &TrayIcon);
         PostQuitMessage(0);
-<<<<<<< HEAD
-        return 0;  // We've just sent our own quit message, with proper hwnd.
-=======
         return 0;/* We've just sent our own quit message, with proper hwnd. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     default:
         if (msg==s_uTaskbarRestart)
             Shell_NotifyIcon(NIM_ADD, &TrayIcon);
@@ -1131,11 +960,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR cmdline, int show)
         DispatchMessage(&msg);
     }
 
-<<<<<<< HEAD
-    // Return the WM_QUIT value.
-=======
     /* Return the WM_QUIT value. */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     return (int) msg.wParam;
 }
 #elif defined(USE_COCOA)
@@ -1172,35 +997,15 @@ int main(int argc, char *argv[])
     [NSAutoreleasePool new];
     [NSApplication sharedApplication];
 
-<<<<<<< HEAD
-    // Add delegate to process menu item actions
-    Civetweb *myDelegate = [[Civetweb alloc] autorelease];
-[NSApp setDelegate: myDelegate];
-
-    // Run this app as agent
-=======
     /* Add delegate to process menu item actions */
     Civetweb *myDelegate = [[Civetweb alloc] autorelease];
 [NSApp setDelegate: myDelegate];
 
     /* Run this app as agent */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     ProcessSerialNumber psn = { 0, kCurrentProcess };
     TransformProcessType(&psn, kProcessTransformToBackgroundApplication);
     SetFrontProcess(&psn);
 
-<<<<<<< HEAD
-    // Add status bar menu
-    id menu = [[NSMenu new] autorelease];
-
-    // Add version menu item
-[menu addItem:[[[NSMenuItem alloc]
-                    //initWithTitle:[NSString stringWithFormat:@"%s", server_name]
-                initWithTitle:[NSString stringWithUTF8String:server_name]
-                action:@selector(noexist) keyEquivalent:@""] autorelease]];
-
-    // Add configuration menu item
-=======
     /* Add status bar menu */
     id menu = [[NSMenu new] autorelease];
 
@@ -1211,51 +1016,31 @@ int main(int argc, char *argv[])
                 action:@selector(noexist) keyEquivalent:@""] autorelease]];
 
     /* Add configuration menu item */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 [menu addItem:[[[NSMenuItem alloc]
                 initWithTitle:@"Edit configuration"
                 action:@selector(editConfig) keyEquivalent:@""] autorelease]];
 
-<<<<<<< HEAD
-    // Add connect menu item
-=======
     /* Add connect menu item */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 [menu addItem:[[[NSMenuItem alloc]
                 initWithTitle:@"Open web root in a browser"
                 action:@selector(openBrowser) keyEquivalent:@""] autorelease]];
 
-<<<<<<< HEAD
-    // Separator
-[menu addItem:[NSMenuItem separatorItem]];
-
-    // Add quit menu item
-=======
     /* Separator */
 [menu addItem:[NSMenuItem separatorItem]];
 
     /* Add quit menu item */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 [menu addItem:[[[NSMenuItem alloc]
                 initWithTitle:@"Quit"
                 action:@selector(shutDown) keyEquivalent:@"q"] autorelease]];
 
-<<<<<<< HEAD
-    // Attach menu to the status bar
-=======
     /* Attach menu to the status bar */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     id item = [[[NSStatusBar systemStatusBar]
             statusItemWithLength:NSVariableStatusItemLength] retain];
 [item setHighlightMode:YES];
 [item setImage:[NSImage imageNamed:@"civetweb_22x22.png"]];
 [item setMenu:menu];
 
-<<<<<<< HEAD
-    // Run the app
-=======
     /* Run the app */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 [NSApp activateIgnoringOtherApps:YES];
     [NSApp run];
 

src/mod_lua.inl

@@ -161,17 +161,10 @@ static int lsp(struct mg_connection *conn, const char *path,
 
     for (i = 0; i < len; i++) {
         if (p[i] == '\n') lines++;
-<<<<<<< HEAD
-        if (p[i] == '<' && p[i + 1] == '?') {
-            for (j = i + 1; j < len ; j++) {
-                if (p[j] == '\n') lualines++;
-                if (p[j] == '?' && p[j + 1] == '>') {
-=======
         if ((i + 1) < len && p[i] == '<' && p[i + 1] == '?') {
             for (j = i + 1; j < len ; j++) {
                 if (p[j] == '\n') lualines++;
                 if ((j + 1) < len && p[j] == '?' && p[j + 1] == '>') {
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
                     mg_write(conn, p + pos, i - pos);
 
                     snprintf(chunkname, sizeof(chunkname), "@%s+%i", path, lines);
@@ -278,15 +271,12 @@ static void prepare_lua_environment(struct mg_connection *conn, lua_State *L)
         luaopen_lsqlite3(L);
     }
 #endif
-<<<<<<< HEAD
-=======
 #ifdef USE_LUA_FILE_SYSTEM
     {
         extern int luaopen_lfs(lua_State *);
         luaopen_lfs(L);
     }
 #endif
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
     luaL_newmetatable(L, LUASOCKET);
     lua_pushliteral(L, "__index");
@@ -430,9 +420,6 @@ static int handle_lsp_request(struct mg_connection *conn, const char *path,
     if (L != NULL && ls == NULL) lua_close(L);
     if (p != NULL) munmap(p, filep->size);
     mg_fclose(filep);
-<<<<<<< HEAD
-=======
     conn->must_close=1;
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     return error;
 }

src/third_party/lsqlite3.c

@@ -1,10 +1,6 @@
 /************************************************************************
 * lsqlite3                                                              *
-<<<<<<< HEAD
-* Copyright (C) 2002-2007 Tiago Dionizio, Doug Currie                   *
-=======
 * Copyright (C) 2002-2013 Tiago Dionizio, Doug Currie                   *
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 * All rights reserved.                                                  *
 * Author    : Tiago Dionizio <tiago.dionizio@ist.utl.pt>                *
 * Author    : Doug Currie <doug.currie@alum.mit.edu>                    *
@@ -38,8 +34,6 @@
 #include "lua.h"
 #include "lauxlib.h"
 
-<<<<<<< HEAD
-=======
 #if LUA_VERSION_NUM > 501
 //
 // Lua 5.2
@@ -53,19 +47,15 @@
 #define luaL_openlib(L,name,reg,nup) luaL_setfuncs(L,reg,nup)
 #endif
 
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 #include "sqlite3.h"
 
 /* compile time features */
 #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)
     #define SQLITE_OMIT_PROGRESS_CALLBACK 0
 #endif
-<<<<<<< HEAD
-=======
 #if !defined(LSQLITE_OMIT_UPDATE_HOOK)
     #define LSQLITE_OMIT_UPDATE_HOOK 0
 #endif
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
 typedef struct sdb sdb;
 typedef struct sdb_vm sdb_vm;
@@ -103,8 +93,6 @@ struct sdb {
 
     int trace_cb;       /* trace callback */
     int trace_udata;
-<<<<<<< HEAD
-=======
 
 #if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
 
@@ -118,7 +106,6 @@ struct sdb {
     int rollback_hook_udata;
 
 #endif
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 };
 
 static const char *sqlite_meta      = ":sqlite3";
@@ -621,9 +608,6 @@ static sdb *newdb (lua_State *L) {
     db->progress_cb =
     db->progress_udata =
     db->trace_cb =
-<<<<<<< HEAD
-    db->trace_udata = LUA_NOREF;
-=======
     db->trace_udata = 
 #if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
     db->update_hook_cb =
@@ -634,7 +618,6 @@ static sdb *newdb (lua_State *L) {
     db->rollback_hook_udata =
 #endif
      LUA_NOREF;
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
     luaL_getmetatable(L, sqlite_meta);
     lua_setmetatable(L, -2);        /* set metatable */
@@ -682,8 +665,6 @@ static int cleanupdb(lua_State *L, sdb *db) {
     luaL_unref(L, LUA_REGISTRYINDEX, db->progress_udata);
     luaL_unref(L, LUA_REGISTRYINDEX, db->trace_cb);
     luaL_unref(L, LUA_REGISTRYINDEX, db->trace_udata);
-<<<<<<< HEAD
-=======
 #if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
     luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_cb);
     luaL_unref(L, LUA_REGISTRYINDEX, db->update_hook_udata);
@@ -692,7 +673,6 @@ static int cleanupdb(lua_State *L, sdb *db) {
     luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_cb);
     luaL_unref(L, LUA_REGISTRYINDEX, db->rollback_hook_udata);
 #endif
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
     /* close database */
     result = sqlite3_close(db->db);
@@ -714,11 +694,7 @@ static int cleanupdb(lua_State *L, sdb *db) {
 
 static sdb *lsqlite_getdb(lua_State *L, int index) {
     sdb *db = (sdb*)luaL_checkudata(L, index, sqlite_meta);
-<<<<<<< HEAD
-    // TODO lsm if (db == NULL) luaL_typerror(L, index, "sqlite database");
-=======
     if (db == NULL) luaL_typerror(L, index, "sqlite database");
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     return db;
 }
 
@@ -750,11 +726,7 @@ static lcontext *lsqlite_make_context(lua_State *L) {
 
 static lcontext *lsqlite_getcontext(lua_State *L, int index) {
     lcontext *ctx = (lcontext*)luaL_checkudata(L, index, sqlite_ctx_meta);
-<<<<<<< HEAD
-    // TODO lsm if (ctx == NULL) luaL_typerror(L, index, "sqlite context");
-=======
     if (ctx == NULL) luaL_typerror(L, index, "sqlite context");
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     return ctx;
 }
 
@@ -1254,11 +1226,7 @@ static int db_trace(lua_State *L) {
         db->trace_cb =
         db->trace_udata = LUA_NOREF;
 
-<<<<<<< HEAD
-        /* clear busy handler */
-=======
         /* clear trace handler */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         sqlite3_trace(db->db, NULL, NULL);
     }
     else {
@@ -1273,19 +1241,13 @@ static int db_trace(lua_State *L) {
         db->trace_udata = luaL_ref(L, LUA_REGISTRYINDEX);
         db->trace_cb = luaL_ref(L, LUA_REGISTRYINDEX);
 
-<<<<<<< HEAD
-        /* set busy handler */
-=======
         /* set trace handler */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
         sqlite3_trace(db->db, db_trace_callback, db);
     }
 
     return 0;
 }
 
-<<<<<<< HEAD
-=======
 #if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
 
 /*
@@ -1468,7 +1430,6 @@ static int db_rollback_hook(lua_State *L) {
 }
 
 #endif /* #if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK */
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
 #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK) || !SQLITE_OMIT_PROGRESS_CALLBACK
 
@@ -1988,8 +1949,6 @@ static const struct {
     SC(INTEGER)     SC(FLOAT)       SC(TEXT)        SC(BLOB)
     SC(NULL)
 
-<<<<<<< HEAD
-=======
     /* Authorizer Action Codes */
     SC(CREATE_INDEX       )
     SC(CREATE_TABLE       )
@@ -2024,7 +1983,6 @@ static const struct {
     SC(FUNCTION           )
     SC(SAVEPOINT          )
 
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
     /* terminator */
     { NULL, 0 }
 };
@@ -2050,14 +2008,11 @@ static const luaL_Reg dblib[] = {
     {"progress_handler",    db_progress_handler     },
     {"busy_timeout",        db_busy_timeout         },
     {"busy_handler",        db_busy_handler         },
-<<<<<<< HEAD
-=======
 #if !defined(LSQLITE_OMIT_UPDATE_HOOK) || !LSQLITE_OMIT_UPDATE_HOOK
     {"update_hook",         db_update_hook          },
     {"commit_hook",         db_commit_hook          },
     {"rollback_hook",       db_rollback_hook        },
 #endif
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
     {"prepare",             db_prepare              },
     {"rows",                db_rows                 },
@@ -2167,8 +2122,6 @@ static void create_meta(lua_State *L, const char *name, const luaL_Reg *lib) {
     lua_pop(L, 1);
 }
 
-<<<<<<< HEAD
-=======
 
 static int luaopen_sqlitelib (lua_State *L) {
     luaL_newlibtable(L, sqlitelib);
@@ -2177,7 +2130,6 @@ static int luaopen_sqlitelib (lua_State *L) {
 }
 
 
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 LUALIB_API int luaopen_lsqlite3(lua_State *L) {
     create_meta(L, sqlite_meta, dblib);
     create_meta(L, sqlite_vm_meta, vmlib);
@@ -2187,11 +2139,7 @@ LUALIB_API int luaopen_lsqlite3(lua_State *L) {
     sqlite_ctx_meta_ref = luaL_ref(L, LUA_REGISTRYINDEX);
 
     /* register (local) sqlite metatable */
-<<<<<<< HEAD
-    luaL_register(L, "sqlite3", sqlitelib);
-=======
     luaL_requiref(L, "sqlite3", luaopen_sqlitelib, 1);
->>>>>>> b393b8d2410737a01a0d18987b5dfc185b3c0ef3
 
     {
         int i = 0;