diff --git a/main.c b/main.c
index 0568c26b..7cd27f9a 100644
--- a/main.c
+++ b/main.c
@@ -57,239 +57,213 @@ static int exit_flag;	                /* Program termination flag	*/
 #define	CONFIG_FILE		"mongoose.conf"
 #endif /* !CONFIG_FILE */
 
-static void
-signal_handler(int sig_num)
-{
+#define MAX_OPTIONS 40
+
+static void signal_handler(int sig_num) {
 #if !defined(_WIN32)
-	if (sig_num == SIGCHLD) {
-		do {
-		} while (waitpid(-1, &sig_num, WNOHANG) > 0);
-	} else
+  if (sig_num == SIGCHLD) {
+    do {
+    } while (waitpid(-1, &sig_num, WNOHANG) > 0);
+  } else
 #endif /* !_WIN32 */
-	{
-		exit_flag = sig_num;
-	}
+  {
+    exit_flag = sig_num;
+  }
 }
 
 /*
  * Edit the passwords file.
  */
-static int
-mg_edit_passwords(const char *fname, const char *domain,
-		const char *user, const char *pass)
-{
-	struct mg_context	*ctx;
-	struct mg_config	config;
-	int			retval;
+static int mg_edit_passwords(const char *fname, const char *domain,
+                             const char *user, const char *pass) {
+  struct mg_context	*ctx;
+  const char *options[] = {"authentication_domain", NULL, NULL};
+  int success;
 
-	memset(&config, 0, sizeof(config));
-	config.auth_domain = (char *) domain;
-	config.num_threads = "0";
-	config.listening_ports = "";
-	ctx = mg_start(&config);
-	retval = mg_modify_passwords_file(ctx, fname, user, pass);
-	mg_stop(ctx);
+  options[1] = domain;
+  ctx = mg_start(NULL, options);
+  success = mg_modify_passwords_file(ctx, fname, user, pass);
+  mg_stop(ctx);
 
-	return (retval);
+  return success;
 }
 
-#define OFFSET(x) offsetof(struct mg_config, x)
+static void show_usage_and_exit(void) {
+  const char **names;
+  int i, len;
 
-static struct option_descriptor {
-	const char *name;
-	const char *description;
-	size_t offset;
-} known_options[] = {
-	{"root", "\tWeb root directory", OFFSET(document_root)},
-	{"index_files",	"Index files", OFFSET(index_files)},
-	{"ssl_cert", "SSL certificate file", OFFSET(ssl_certificate)},
-	{"ports", "Listening ports", OFFSET(listening_ports)},
-	{"dir_list", "Directory listing", OFFSET(enable_directory_listing)},
-	{"protect", "URI to htpasswd mapping", OFFSET(protect)},
-	{"cgi_ext", "CGI extensions", OFFSET(cgi_extensions)},
-	{"cgi_interp", "CGI interpreter to use", OFFSET(cgi_interpreter)},
-	{"cgi_env", "Custom CGI enviroment variables", OFFSET(cgi_environment)},
-	{"ssi_ext", "SSI extensions", OFFSET(ssi_extensions)},
-	{"auth_realm", "Authentication domain name", OFFSET(auth_domain)},
-	{"auth_gpass", "Global passwords file", OFFSET(global_passwords_file)},
-	{"auth_PUT", "PUT,DELETE auth file", OFFSET(put_delete_passwords_file)},
-	{"uid", "\tRun as user", OFFSET(uid)},
-	{"access_log", "Access log file", OFFSET(access_log_file)},
-	{"error_log", "Error log file", OFFSET(error_log_file)},
-	{"acl", "\tAllow/deny IP addresses/subnets", OFFSET(acl)},
-	{"num_threads", "Threads to spawn", OFFSET(num_threads)},
-	{"mime_types", "Extra mime types to use", OFFSET(mime_types)},
-	{NULL, NULL, 0}
-};
+  fprintf(stderr, "Mongoose version %s (c) Sergey Lyubka\n", mg_version());
+  fprintf(stderr, "Usage:\n");
+  fprintf(stderr, "  mongoose -A <htpasswd_file> <realm> <user> <passwd>\n");
+  fprintf(stderr, "  mongoose <config_file>\n");
+  fprintf(stderr, "  mongoose [-option value ...]\n");
+  fprintf(stderr, "OPTIONS:\n  ");
 
-static void
-show_usage_and_exit(const struct mg_config *config)
-{
-	const struct option_descriptor	*o;
-	const char			*value;
+  names = mg_get_valid_option_names();
+  len = 2;
+  for (i = 0; names[i] != NULL; i++) {
+    len += strlen(names[i]) + 1;
+    if (len >= 80) {
+      len = strlen(names[i]) + 3;
+      fprintf(stderr, "%s", "\n  ");
+    }
+    fprintf(stderr, "%s%c", names[i], names[i + 1] == NULL ? '\n' : ',');
+  }
+  fprintf(stderr, "See  http://code.google.com/p/mongoose/wiki/MongooseManual"
+          " for more details.\n");
+  fprintf(stderr, "Example:\n  mongoose -listening_ports 80,443s "
+          "-enable_directory_listing no\n");
 
-	(void) fprintf(stderr,
-	    "Mongoose version %s (c) Sergey Lyubka\n"
-	    "usage: mongoose [options] [config_file]\n", mg_version());
-
-	fprintf(stderr, "  -A <htpasswd_file> <realm> <user> <passwd>\n");
-
-	for (o = known_options; o->name != NULL; o++) {
-		(void) fprintf(stderr, "  -%s\t%s", o->name, o->description);
-		value = * (char **) ((char *) config + o->offset);
-		if (value != NULL)
-			fprintf(stderr, " (default: \"%s\")", value);
-		fputc('\n', stderr);
-	}
-
-	exit(EXIT_FAILURE);
+  exit(EXIT_FAILURE);
 }
 
-static void
-set_option(struct mg_config *config, const char *name, char *value)
-{
-	const struct option_descriptor *o;
-
-	for (o = known_options; o->name != NULL; o++)
-		if (strcmp(name, o->name) == 0) {
-			* (char **) ((char *) config + o->offset) = value;
-			break;
-		}
-
-	if (o->name == NULL)
-		show_usage_and_exit(config);
+static char *sdup(const char *str) {
+  char *p;
+  if ((p = malloc(strlen(str) + 1)) != NULL) {
+    strcpy(p, str);
+  }
+  return p;
 }
 
-static void
-process_command_line_arguments(struct mg_config *config, char *argv[])
-{
-	const char	*config_file = CONFIG_FILE;
-	char		line[512], opt[512], *vals[100],
-				val[512], path[FILENAME_MAX], *p;
-	FILE		*fp;
-	size_t		i, line_no = 0;
+static void set_option(char **options, const char *name, const char *value) {
+  int i;
 
-	/* First find out, which config file to open */
-	for (i = 1; argv[i] != NULL && argv[i][0] == '-'; i += 2)
-		if (argv[i + 1] == NULL)
-			show_usage_and_exit(config);
+  for (i = 0; i < MAX_OPTIONS - 3; i++) {
+    if (options[i] == NULL) {
+      options[i] = sdup(name);
+      options[i + 1] = sdup(value);
+      options[i + 2] = NULL;
+      break;
+    }
+  }
 
-	if (argv[i] != NULL && argv[i + 1] != NULL) {
-		/* More than one non-option arguments are given */
-		show_usage_and_exit(config);
-	} else if (argv[i] != NULL) {
-		/* Just one non-option argument is given, this is config file */
-		config_file = argv[i];
-	} else {
-		/* No config file specified. Look for one where binary lives */
-		if ((p = strrchr(argv[0], DIRSEP)) != 0) {
-			(void) snprintf(path, sizeof(path), "%.*s%s",
-			    (int) (p - argv[0]) + 1, argv[0], config_file);
-			config_file = path;
-		}
-	}
-
-	fp = fopen(config_file, "r");
-
-	/* If config file was set in command line and open failed, exit */
-	if (fp == NULL && argv[i] != NULL) {
-		(void) fprintf(stderr, "cannot open config file %s: %s\n",
-		    config_file, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	/* Reset temporary value holders */
-	(void) memset(vals, 0, sizeof(vals));
-
-	if (fp != NULL) {
-		(void) printf("Loading config file %s, "
-		    "ignoring command line arguments\n", config_file);
-
-		/* Loop over the lines in config file */
-		while (fgets(line, sizeof(line), fp) != NULL) {
-
-			line_no++;
-
-			/* Ignore empty lines and comments */
-			if (line[0] == '#' || line[0] == '\n')
-				continue;
-
-			if (sscanf(line, "%s %[^\r\n#]", opt, val) != 2) {
-				fprintf(stderr, "%s: line %d is invalid\n",
-				    config_file, (int) line_no);
-				exit(EXIT_FAILURE);
-			}
-			/* TODO(lsm): free this at some point */
-			p = malloc(strlen(val) + 1);
-			(void) strcpy(p, val);
-			set_option(config, opt, p);
-		}
-
-		(void) fclose(fp);
-	} else {
-		for (i = 1; argv[i] != NULL && argv[i][0] == '-'; i += 2)
-			set_option(config, &argv[i][1], argv[i + 1]);
-	}
+  if (i == MAX_OPTIONS - 3) {
+    fprintf(stderr, "%s\n", "Too many options specified");
+    exit(EXIT_FAILURE);
+  }
 }
 
-int
-main(int argc, char *argv[])
-{
-	struct mg_config	config;
-	struct mg_context	*ctx;
+static void process_command_line_arguments(char *argv[], char **options) {
+  const char	*config_file = CONFIG_FILE;
+  char line[512], opt[512], *vals[100], val[512], path[FILENAME_MAX], *p;
+  FILE *fp;
+  size_t i, line_no = 0;
 
-	/* Initialize configuration with default values */
-	(void) memset(&config, 0, sizeof(config));
-        config.document_root = ".";
-        config.enable_directory_listing = "yes";
-        config.auth_domain = "mydomain.com";
-        config.num_threads = "20";
-        config.index_files = "index.html,index.htm,index.cgi";
-        config.cgi_extensions = ".cgi,.pl,.php";
-        config.ssi_extensions = ".shtml,.shtm";
-	config.listening_ports = "8080";
+  /* First find out, which config file to open */
+  for (i = 1; argv[i] != NULL && argv[i][0] == '-'; i += 2)
+    if (argv[i + 1] == NULL)
+      show_usage_and_exit();
 
-	/* Edit passwords file if -A option is specified */
-	if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'A') {
-		if (argc != 6)
-			show_usage_and_exit(&config);
-		exit(mg_edit_passwords(argv[2], argv[3], argv[4], argv[5]) ==
-		    MG_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE);
-	}
+  if (argv[i] != NULL && argv[i + 1] != NULL) {
+    /* More than one non-option arguments are given */
+    show_usage_and_exit();
+  } else if (argv[i] != NULL) {
+    /* Just one non-option argument is given, this is config file */
+    config_file = argv[i];
+  } else {
+    /* No config file specified. Look for one where binary lives */
+    if ((p = strrchr(argv[0], DIRSEP)) != 0) {
+      snprintf(path, sizeof(path), "%.*s%s",
+               (int) (p - argv[0]) + 1, argv[0], config_file);
+      config_file = path;
+    }
+  }
 
-	/* Show usage if -h or --help options are specified */
-	if (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")))
-		show_usage_and_exit(&config);
+  fp = fopen(config_file, "r");
 
-	/* Update config based on command line arguments */
-	process_command_line_arguments(&config, argv);
+  /* If config file was set in command line and open failed, exit */
+  if (fp == NULL && argv[i] != NULL) {
+    fprintf(stderr, "cannot open config file %s: %s\n",
+            config_file, strerror(errno));
+    exit(EXIT_FAILURE);
+  }
 
-	/* Setup signal handler: quit on Ctrl-C */
+  /* Reset temporary value holders */
+  (void) memset(vals, 0, sizeof(vals));
+
+  if (fp != NULL) {
+    printf("Loading config file %s, ignoring command line arguments\n",
+           config_file);
+
+    /* Loop over the lines in config file */
+    while (fgets(line, sizeof(line), fp) != NULL) {
+
+      line_no++;
+
+      /* Ignore empty lines and comments */
+      if (line[0] == '#' || line[0] == '\n')
+        continue;
+
+      if (sscanf(line, "%s %[^\r\n#]", opt, val) != 2) {
+        fprintf(stderr, "%s: line %d is invalid\n",
+                config_file, (int) line_no);
+        exit(EXIT_FAILURE);
+      }
+      set_option(options, opt, val);
+    }
+
+    (void) fclose(fp);
+  } else {
+    for (i = 1; argv[i] != NULL && argv[i][0] == '-'; i += 2)
+      set_option(options, &argv[i][1], argv[i + 1]);
+  }
+}
+
+int main(int argc, char *argv[]) {
+  struct mg_context	*ctx;
+  char *options[MAX_OPTIONS];
+  int i;
+
+  /* Edit passwords file if -A option is specified */
+  if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'A') {
+    if (argc != 6) {
+      show_usage_and_exit();
+    }
+    exit(mg_edit_passwords(argv[2], argv[3], argv[4], argv[5]) ?
+         EXIT_SUCCESS : EXIT_FAILURE);
+  }
+
+  /* Show usage if -h or --help options are specified */
+  if (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))) {
+    show_usage_and_exit();
+  }
+
+  /* Update config based on command line arguments */
+  options[0] = NULL;
+  process_command_line_arguments(argv, options);
+
+  /* Setup signal handler: quit on Ctrl-C */
 #ifndef _WIN32
-	(void) signal(SIGCHLD, signal_handler);
+  signal(SIGCHLD, signal_handler);
 #endif /* _WIN32 */
-	(void) signal(SIGTERM, signal_handler);
-	(void) signal(SIGINT, signal_handler);
+  signal(SIGTERM, signal_handler);
+  signal(SIGINT, signal_handler);
 
-	/* Start Mongoose */
-	if ((ctx = mg_start(&config)) == NULL) {
-		(void) printf("%s\n", "Cannot initialize Mongoose context");
-		exit(EXIT_FAILURE);
-	}
+  /* Start Mongoose */
+  ctx = mg_start(NULL, (const char **) options);
+  for (i = 0; options[i] != NULL; i++) {
+    free(options[i]);
+  }
 
-	(void) printf("Mongoose %s started on port(s) %s "
-	    "with web root [%s]\n",
-	    mg_version(), config.listening_ports, config.document_root);
+  if (ctx == NULL) {
+    (void) printf("%s\n", "Cannot initialize Mongoose context");
+    exit(EXIT_FAILURE);
+  }
 
-	fflush(stdout);
-	while (exit_flag == 0)
-		sleep(1);
+  printf("Mongoose %s started on port(s) %s with web root [%s]\n",
+         mg_version(), mg_get_option(ctx, "listening_ports"),
+         mg_get_option(ctx, "document_root"));
 
-	(void) printf("Exiting on signal %d, "
-	    "waiting for all threads to finish...", exit_flag);
-	fflush(stdout);
-	mg_stop(ctx);
-	(void) printf("%s", " done.\n");
+  fflush(stdout);
+  while (exit_flag == 0) {
+    sleep(1);
+  }
 
-	return (EXIT_SUCCESS);
+  printf("Exiting on signal %d, waiting for all threads to finish...",
+         exit_flag);
+  fflush(stdout);
+  mg_stop(ctx);
+  printf("%s", " done.\n");
+
+  return EXIT_SUCCESS;
 }
diff --git a/mongoose.c b/mongoose.c
index 2952f49f..c501c656 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -222,7 +222,6 @@ typedef int SOCKET;
 typedef int socklen_t;
 #endif // NO_SOCKLEN_T
 
-typedef enum {MG_FALSE, MG_TRUE} bool_t;
 typedef void * (*mg_thread_func_t)(void *);
 
 static const char *http_500_error = "Internal Server Error";
@@ -333,9 +332,9 @@ struct vec {
 
 // Structure used by mg_stat() function. Uses 64 bit file length.
 struct mgstat {
-  bool_t is_directory;  // Directory marker 
-  int64_t size;         // File size
-  time_t mtime;         // Modification time
+  int is_directory;  // Directory marker 
+  int64_t size;      // File size
+  time_t mtime;      // Modification time
 };
 
 // Describes listening socket, or socket which was accept()-ed by the master
@@ -345,19 +344,39 @@ struct socket {
   SOCKET sock;          // Listening socket
   struct usa lsa;       // Local socket address
   struct usa rsa;       // Remote socket address
-  bool_t is_ssl;        // Is socket SSL-ed
+  int is_ssl;           // Is socket SSL-ed
+};
+
+enum {
+  DOCUMENT_ROOT, LISTENING_PORTS, INDEX_FILES, SSL_CERTIFICATE, CGI_EXTENSIONS,
+  CGI_INTERPRETER, CGI_ENVIRONMENT, SSI_EXTENSIONS, AUTHENTICATION_DOMAIN,
+  URI_PROTECTION, GLOBAL_PASSWORDS_FILE, PUT_DELETE_PASSWORDS_FILE,
+  ACCESS_LOG_FILE, ERROR_LOG_FILE, ACCESS_CONTROL_LIST, RUN_AS_USER,
+  EXTRA_MIME_TYPES, ENABLE_DIRECTORY_LISTING, ENABLE_KEEP_ALIVE, NUM_THREADS,
+  NUM_OPTIONS
+};
+
+static const char *option_names[] = {
+  "document_root", "listening_ports", "index_files", "ssl_certificate",
+  "cgi_extensions", "cgi_interpreter", "cgi_environment", "ssi_extensions",
+  "authentication_domain", "protect_uri", "global_passwords_file",
+  "put_delete_passwords_file", "access_log_file", "error_log_file",
+  "access_control_list", "run_as_user", "extra_mime_types",
+  "enable_directory_listing", "enable_keep_alive", "num_threads",
+  NULL
 };
 
 struct mg_context {
-  int stop_flag;     // Should we stop event loop
-  SSL_CTX *ssl_ctx;  // SSL context
-  const struct mg_config *config; // Mongoose configuration
+  int stop_flag;                // Should we stop event loop
+  SSL_CTX *ssl_ctx;             // SSL context
+  char *config[NUM_OPTIONS];    // Mongoose configuration parameters
+  mg_callback_t user_callback;  // User-defined callback function
 
   struct socket *listening_sockets;
 
-  int num_threads;         // Number of threads
-  pthread_mutex_t mutex;   // Protects (max|num)_threads
-  pthread_cond_t  cond;    // Condvar for tracking workers terminations
+  int num_threads;           // Number of threads
+  pthread_mutex_t mutex;     // Protects (max|num)_threads
+  pthread_cond_t  cond;      // Condvar for tracking workers terminations
 
   struct socket queue[20];   // Accepted sockets
   int sq_head;               // Head of the socket queue
@@ -380,11 +399,39 @@ struct mg_connection {
   int data_len;               // Total size of data in a buffer
 };
 
+const char **mg_get_valid_option_names(void) {
+  return option_names;
+}
+
+static void *call_user(struct mg_connection *conn, enum mg_event event) {
+  return conn->ctx->user_callback == NULL ? NULL :
+    conn->ctx->user_callback(event, conn, &conn->request_info);
+}
+
+static int get_option_index(const char *name) {
+  int i;
+  for (i = 0; option_names[i] != NULL; i++) {
+    if (strcmp(option_names[i], name) == 0) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+const char *mg_get_option(const struct mg_context *ctx, const char *name) {
+  int i;
+  if ((i = get_option_index(name)) == -1) {
+    return NULL;
+  } else if (ctx->config[i] == NULL) {
+    return "";
+  } else {
+    return ctx->config[i];
+  }
+}
+
 // Print error message to the opened error log stream.
 static void cry(struct mg_connection *conn, const char *fmt, ...) {
   char buf[BUFSIZ];
-  mg_callback_t log_callback;
-  enum mg_error_t processed = MG_ERROR;
   va_list ap;
   FILE *fp;
   time_t timestamp;
@@ -396,14 +443,10 @@ static void cry(struct mg_connection *conn, const char *fmt, ...) {
   // Do not lock when getting the callback value, here and below.
   // I suppose this is fine, since function cannot disappear in the
   // same way string option can.
-  log_callback = conn->ctx->config->event_log_handler;
   conn->request_info.log_message = buf;
-  if (log_callback != NULL) {
-    processed = log_callback(conn, &conn->request_info);
-  }
-  if (processed == MG_ERROR) {
-    fp = conn->ctx->config->error_log_file == NULL ? stderr :
-      mg_fopen(conn->ctx->config->error_log_file, "a+");
+  if (call_user(conn, MG_EVENT_LOG) == NULL) {
+    fp = conn->ctx->config[ERROR_LOG_FILE] == NULL ? stderr :
+      mg_fopen(conn->ctx->config[ERROR_LOG_FILE], "a+");
 
     if (fp != NULL) {
       flockfile(fp);
@@ -611,7 +654,7 @@ static const char *next_option(const char *list, struct vec *val,
 }
 
 #if !defined(NO_CGI)
-static bool_t match_extension(const char *path, const char *ext_list) {
+static int match_extension(const char *path, const char *ext_list) {
   struct vec ext_vec;
   size_t path_len;
 
@@ -621,9 +664,9 @@ static bool_t match_extension(const char *path, const char *ext_list) {
     if (ext_vec.len < path_len &&
         mg_strncasecmp(path + path_len - ext_vec.len,
           ext_vec.ptr, ext_vec.len) == 0)
-      return MG_TRUE;
+      return 1;
 
-  return MG_FALSE;
+  return 0;
 }
 #endif // !NO_CGI
 
@@ -632,17 +675,11 @@ static void send_http_error(struct mg_connection *conn, int status,
   char buf[BUFSIZ];
   va_list ap;
   int len;
-  mg_callback_t error_handler;
-  bool_t handled;
 
   DEBUG_TRACE(("%d %s", status, reason));
   conn->request_info.status_code = status;
 
-  error_handler = conn->ctx->config->http_error_handler;
-  handled = error_handler ?
-    error_handler(conn, &conn->request_info) : MG_ERROR;
-
-  if (handled == MG_ERROR) {
+  if (call_user(conn, MG_HTTP_ERROR) == NULL) {
     buf[0] = '\0';
     len = 0;
 
@@ -668,7 +705,7 @@ static void send_http_error(struct mg_connection *conn, int status,
 #ifdef _WIN32
 static int pthread_mutex_init(pthread_mutex_t *mutex, void *unused) {
   unused = NULL;
-  *mutex = CreateMutex(NULL, MG_FALSE, NULL);
+  *mutex = CreateMutex(NULL, FALSE, NULL);
   return *mutex == NULL ? -1 : 0;
 }
 
@@ -686,7 +723,7 @@ static int pthread_mutex_unlock(pthread_mutex_t *mutex) {
 
 static int pthread_cond_init(pthread_cond_t *cv, const void *unused) {
   unused = NULL;
-  *cv = CreateEvent(NULL, MG_FALSE, MG_FALSE, NULL);
+  *cv = CreateEvent(NULL, FALSE, FALSE, NULL);
   return *cv == NULL ? -1 : 0;
 }
 
@@ -1021,9 +1058,9 @@ static pid_t spawn_process(struct mg_connection *conn, const char *prog,
 
   me = GetCurrentProcess();
   (void) DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdin), me,
-      &si.hStdInput, 0, MG_TRUE, DUPLICATE_SAME_ACCESS);
+      &si.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
   (void) DuplicateHandle(me, (HANDLE) _get_osfhandle(fd_stdout), me,
-      &si.hStdOutput, 0, MG_TRUE, DUPLICATE_SAME_ACCESS);
+      &si.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
 
   // If CGI file is a script, try to read the interpreter line
   interp = conn->ctx->config->cgi_interpreter;
@@ -1056,7 +1093,7 @@ static pid_t spawn_process(struct mg_connection *conn, const char *prog,
   change_slashes_to_backslashes(line);
 
   DEBUG_TRACE(("Running [%s]", cmdline));
-  if (CreateProcessA(NULL, cmdline, NULL, NULL, MG_TRUE,
+  if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE,
         CREATE_NEW_PROCESS_GROUP, envblk, line, &si, &pi) == 0) {
     cry(conn, "%s: CreateProcess(%s): %d",
         __func__, cmdline, ERRNO);
@@ -1139,12 +1176,12 @@ static pid_t spawn_process(struct mg_connection *conn, const char *prog,
     } else if (dup2(fd_stdout, 1) == -1) {
       cry(conn, "%s: dup2(%d, 1): %s", __func__, fd_stdout, strerror(ERRNO));
     } else {
-      (void) dup2(fd_stdout, 2);
+      //(void) dup2(fd_stdout, 2);
       (void) close(fd_stdin);
       (void) close(fd_stdout);
 
       // Execute CGI program. No need to lock: new process
-      interp = conn->ctx->config->cgi_interpreter;
+      interp = conn->ctx->config[CGI_INTERPRETER];
       if (interp == NULL) {
         (void) execle(prog, prog, NULL, envp);
         cry(conn, "%s: execle(%s): %s", __func__, prog, strerror(ERRNO));
@@ -1266,6 +1303,7 @@ int mg_read(struct mg_connection *conn, void *buf, size_t len) {
       if (n <= 0) {
         break;
       }
+      buf = (char *) buf + n;
       conn->consumed_content += n;
       nread += n;
       len -= n;
@@ -1297,7 +1335,7 @@ int mg_printf(struct mg_connection *conn, const char *fmt, ...) {
 // uses '+' as character for space, see RFC 1866 section 8.2.1
 // http://ftp.ics.uci.edu/pub/ietf/html/rfc1866.txt
 static size_t url_decode(const char *src, size_t src_len, char *dst,
-                         size_t dst_len, bool_t is_form_url_encoded) {
+                         size_t dst_len, int is_form_url_encoded) {
   size_t i, j;
   int a, b;
 #define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W')
@@ -1326,72 +1364,58 @@ static size_t url_decode(const char *src, size_t src_len, char *dst,
 // It can be specified in query string, or in the POST data.
 // Return NULL if the variable not found, or allocated 0-terminated value.
 // It is caller's responsibility to free the returned value.
-enum mg_error_t mg_get_var(const char *buf, size_t buf_len,
-                           const char *var_name, char *var_value,
-                           size_t var_value_len) {
+int mg_get_var(const char *buf, size_t buf_len, const char *name,
+               char *dst, size_t dst_len) {
   const char *p, *e, *s;
-  char *val;
-  size_t  var_len, len;
-  enum mg_error_t ret_val;
+  size_t name_len, len;
 
-  var_len = strlen(var_name);
+  name_len = strlen(name);
   e = buf + buf_len;
-  val = NULL;
-  ret_val = MG_NOT_FOUND;
-  var_value[0] = '\0';
+  len = -1;
+  dst[0] = '\0';
 
   // buf is "var1=val1&var2=val2...". Find variable first
-  for (p = buf; p + var_len < e; p++)
-    if ((p == buf || p[-1] == '&') && p[var_len] == '=' &&
-        !mg_strncasecmp(var_name, p, var_len)) {
+  for (p = buf; p != NULL && p + name_len < e; p++) {
+    if ((p == buf || p[-1] == '&') && p[name_len] == '=' &&
+        !mg_strncasecmp(name, p, name_len)) {
 
       // Point p to variable value
-      p += var_len + 1;
+      p += name_len + 1;
 
       // Point s to the end of the value
       s = (const char *) memchr(p, '&', e - p);
       if (s == NULL) {
         s = e;
       }
+      assert(s >= p);
 
-      /* Try to allocate the buffer */
-      len = s - p;
-      if (len >= var_value_len) {
-        ret_val = MG_BUFFER_TOO_SMALL;
-      } else {
-        url_decode(p, len, var_value, len + 1, MG_TRUE);
-        ret_val = MG_SUCCESS;
+      // Decode variable into destination buffer
+      if ((size_t) (s - p) < dst_len) {
+        len = url_decode(p, s - p, dst, dst_len, 1);
       }
       break;
     }
+  }
 
-  return ret_val;
+  return len;
 }
 
-enum mg_error_t mg_get_qsvar(const struct mg_request_info *ri,
-                             const char *var_name, char *var_value,
-                             size_t var_value_len) {
-  return ri->query_string == NULL ? MG_NOT_FOUND : mg_get_var(ri->query_string,
-        strlen(ri->query_string), var_name, var_value, var_value_len);
-}
-
-enum mg_error_t mg_get_cookie(const struct mg_connection *conn,
-                              const char *cookie_name, char *dst,
-                              size_t dst_size) {
+int mg_get_cookie(const struct mg_connection *conn, const char *cookie_name,
+                  char *dst, size_t dst_size) {
   const char *s, *p, *end;
-  int len;
+  int name_len, len = -1;
 
   dst[0] = '\0';
   if ((s = mg_get_header(conn, "Cookie")) == NULL) {
-    return MG_NOT_FOUND;
+    return 0;
   }
 
-  len = strlen(cookie_name);
+  name_len = strlen(cookie_name);
   end = s + strlen(s);
 
-  for (; (s = strstr(s, cookie_name)) != NULL; s += len)
-    if (s[len] == '=') {
-      s += len + 1;
+  for (; (s = strstr(s, cookie_name)) != NULL; s += name_len)
+    if (s[name_len] == '=') {
+      s += name_len + 1;
       if ((p = strchr(s, ' ')) == NULL)
         p = end;
       if (p[-1] == ';')
@@ -1400,15 +1424,14 @@ enum mg_error_t mg_get_cookie(const struct mg_connection *conn,
         s++;
         p--;
       }
-      if ((size_t) (p - s) >= dst_size) {
-        return MG_BUFFER_TOO_SMALL;
-      } else {
-        mg_strlcpy(dst, s, (p - s) + 1);
-        return MG_SUCCESS;
+      if ((size_t) (p - s) < dst_size) {
+        len = (p - s) + 1;
+        mg_strlcpy(dst, s, len);
       }
+      break;
     }
 
-  return MG_NOT_FOUND;
+  return len;
 }
 
 // Mongoose allows to specify multiple directories to serve,
@@ -1422,7 +1445,7 @@ static int get_document_root(const struct mg_connection *conn,
 
   uri = conn->request_info.uri;
   len_of_matched_uri = 0;
-  root = next_option(conn->ctx->config->document_root, document_root, NULL);
+  root = next_option(conn->ctx->config[DOCUMENT_ROOT], document_root, NULL);
 
   while ((root = next_option(root, &uri_vec, &path_vec)) != NULL) {
     if (memcmp(uri, uri_vec.ptr, uri_vec.len) == 0) {
@@ -1650,7 +1673,7 @@ static void get_mime_type(struct mg_context *ctx, const char *path,
 
   // Scan user-defined mime types first, in case user wants to
   // override default mime types.
-  list = ctx->config->mime_types;
+  list = ctx->config[EXTRA_MIME_TYPES];
   while ((list = next_option(list, &ext_vec, &mime_vec)) != NULL) {
     // ext now points to the path suffix
     ext = path + path_len - ext_vec.len;
@@ -1896,10 +1919,9 @@ void mg_md5(char *buf, ...) {
 }
 
 // Check the user's password, return 1 if OK
-static bool_t check_password(const char *method, const char *ha1,
-                             const char *uri, const char *nonce, const char *nc,
-                             const char *cnonce, const char *qop,
-                             const char *response) {
+static int check_password(const char *method, const char *ha1, const char *uri,
+                          const char *nonce, const char *nc, const char *cnonce,
+                          const char *qop, const char *response) {
   char ha2[32 + 1], expected_response[32 + 1];
 
   // NOTE(lsm): due to a bug in MSIE, we do not compare the URI
@@ -1908,7 +1930,7 @@ static bool_t check_password(const char *method, const char *ha1,
       strlen(response) != 32
       // || now - strtoul(dig->nonce, NULL, 10) > 3600
       ) {
-    return MG_FALSE;
+    return 0;
   }
 
   mg_md5(ha2, method, ":", uri, NULL);
@@ -1927,12 +1949,12 @@ static FILE *open_auth_file(struct mg_connection *conn, const char *path) {
   struct mgstat st;
   FILE *fp;
 
-  if (ctx->config->global_passwords_file != NULL) {
+  if (ctx->config[GLOBAL_PASSWORDS_FILE] != NULL) {
     // Use global passwords file
-    fp =  mg_fopen(ctx->config->global_passwords_file, "r");
+    fp =  mg_fopen(ctx->config[GLOBAL_PASSWORDS_FILE], "r");
     if (fp == NULL)
       cry(fc(ctx), "fopen(%s): %s",
-          ctx->config->global_passwords_file, strerror(ERRNO));
+          ctx->config[GLOBAL_PASSWORDS_FILE], strerror(ERRNO));
   } else if (!mg_stat(path, &st) && st.is_directory) {
     (void) mg_snprintf(conn, name, sizeof(name), "%s%c%s",
         path, DIRSEP, PASSWORDS_FILE_NAME);
@@ -1955,14 +1977,14 @@ struct ah {
   char *user, *uri, *cnonce, *response, *qop, *nc, *nonce;
 };
 
-static bool_t parse_auth_header(struct mg_connection *conn, char *buf,
-                                size_t buf_size, struct ah *ah) {
+static int parse_auth_header(struct mg_connection *conn, char *buf,
+                             size_t buf_size, struct ah *ah) {
   char *name, *value, *s;
   const char *auth_header;
 
   if ((auth_header = mg_get_header(conn, "Authorization")) == NULL ||
       mg_strncasecmp(auth_header, "Digest ", 7) != 0) {
-    return MG_FALSE;
+    return 0;
   }
 
   // Make modifiable copy of the auth header
@@ -2016,16 +2038,16 @@ static bool_t parse_auth_header(struct mg_connection *conn, char *buf,
     conn->request_info.remote_user = mg_strdup(ah->user);
   }
 
-  return MG_TRUE;
+  return 1;
 }
 
 // Authorize against the opened passwords file. Return 1 if authorized.
-static bool_t authorize(struct mg_connection *conn, FILE *fp) {
+static int authorize(struct mg_connection *conn, FILE *fp) {
   struct ah ah;
   char line[256], f_user[256], ha1[256], f_domain[256], buf[MAX_REQUEST_SIZE];
 
   if (!parse_auth_header(conn, buf, sizeof(buf), &ah)) {
-    return MG_FALSE;
+    return 0;
   }
 
   // Loop over passwords file
@@ -2035,29 +2057,28 @@ static bool_t authorize(struct mg_connection *conn, FILE *fp) {
     }
 
     if (!strcmp(ah.user, f_user) &&
-        !strcmp(conn->ctx->config->auth_domain, f_domain))
+        !strcmp(conn->ctx->config[AUTHENTICATION_DOMAIN], f_domain))
       return check_password(
             conn->request_info.request_method,
             ha1, ah.uri, ah.nonce, ah.nc, ah.cnonce, ah.qop,
             ah.response);
   }
 
-  return MG_FALSE;
+  return 0;
 }
 
-// Return MG_TRUE if request is authorised, MG_FALSE otherwise.
-static bool_t check_authorization(struct mg_connection *conn,
-                                  const char *path) {
+// Return 1 if request is authorised, 0 otherwise.
+static int check_authorization(struct mg_connection *conn, const char *path) {
   FILE *fp;
   char fname[PATH_MAX];
   struct vec uri_vec, filename_vec;
   const char *list;
-  bool_t authorized;
+  int authorized;
 
   fp = NULL;
-  authorized = MG_TRUE;
+  authorized = 1;
 
-  list = conn->ctx->config->protect;
+  list = conn->ctx->config[URI_PROTECTION];
   while ((list = next_option(list, &uri_vec, &filename_vec)) != NULL) {
     if (!memcmp(conn->request_info.uri, uri_vec.ptr, uri_vec.len)) {
       (void) mg_snprintf(conn, fname, sizeof(fname), "%.*s",
@@ -2087,16 +2108,16 @@ static void send_authorization_request(struct mg_connection *conn) {
       "HTTP/1.1 401 Unauthorized\r\n"
       "WWW-Authenticate: Digest qop=\"auth\", "
       "realm=\"%s\", nonce=\"%lu\"\r\n\r\n",
-      conn->ctx->config->auth_domain,
+      conn->ctx->config[AUTHENTICATION_DOMAIN],
       (unsigned long) time(NULL));
 }
 
-static bool_t is_authorized_for_put(struct mg_connection *conn) {
+static int is_authorized_for_put(struct mg_connection *conn) {
   FILE *fp;
-  int ret = MG_FALSE;
+  int ret = 0;
 
-  fp = conn->ctx->config->put_delete_passwords_file == NULL ? NULL :
-    mg_fopen(conn->ctx->config->put_delete_passwords_file, "r");
+  fp = conn->ctx->config[PUT_DELETE_PASSWORDS_FILE] == NULL ? NULL :
+    mg_fopen(conn->ctx->config[PUT_DELETE_PASSWORDS_FILE], "r");
 
 
   if (fp != NULL) {
@@ -2107,9 +2128,8 @@ static bool_t is_authorized_for_put(struct mg_connection *conn) {
   return ret;
 }
 
-enum mg_error_t mg_modify_passwords_file(struct mg_context *ctx,
-                                         const char *fname, const char *user,
-                                         const char *pass) {
+int mg_modify_passwords_file(struct mg_context *ctx, const char *fname,
+                             const char *user, const char *pass) {
   int found;
   char line[512], u[512], d[512], ha1[33], tmp[PATH_MAX];
   const char *domain;
@@ -2117,7 +2137,7 @@ enum mg_error_t mg_modify_passwords_file(struct mg_context *ctx,
 
   found = 0;
   fp = fp2 = NULL;
-  domain = ctx->config->auth_domain;
+  domain = ctx->config[AUTHENTICATION_DOMAIN];
 
   // Regard empty password as no password - remove user record.
   if (pass[0] == '\0') {
@@ -2134,10 +2154,10 @@ enum mg_error_t mg_modify_passwords_file(struct mg_context *ctx,
   // Open the given file and temporary file
   if ((fp = mg_fopen(fname, "r")) == NULL) {
     cry(fc(ctx), "Cannot open %s: %s", fname, strerror(errno));
-    return MG_ERROR;
+    return 0;
   } else if ((fp2 = mg_fopen(tmp, "w+")) == NULL) {
     cry(fc(ctx), "Cannot open %s: %s", tmp, strerror(errno));
-    return MG_ERROR;
+    return 0;
   }
 
   // Copy the stuff to temporary file
@@ -2171,7 +2191,7 @@ enum mg_error_t mg_modify_passwords_file(struct mg_context *ctx,
   (void) mg_remove(fname);
   (void) mg_rename(tmp, fname);
 
-  return MG_SUCCESS;
+  return 1;
 }
 
 struct de {
@@ -2452,7 +2472,7 @@ static void parse_http_headers(char **buf, struct mg_request_info *ri) {
   }
 }
 
-static bool_t is_valid_http_method(const char *method) {
+static int is_valid_http_method(const char *method) {
   return !strcmp(method, "GET") ||
       !strcmp(method, "POST") ||
       !strcmp(method, "HEAD") ||
@@ -2461,8 +2481,8 @@ static bool_t is_valid_http_method(const char *method) {
 }
 
 // Parse HTTP request, fill in mg_request_info structure.
-static bool_t parse_http_request(char *buf, struct mg_request_info *ri) {
-  int status = MG_FALSE;
+static int parse_http_request(char *buf, struct mg_request_info *ri) {
+  int status = 0;
 
   ri->request_method = skip(&buf, " ");
   ri->uri = skip(&buf, " ");
@@ -2473,7 +2493,7 @@ static bool_t parse_http_request(char *buf, struct mg_request_info *ri) {
       strncmp(ri->http_version, "HTTP/", 5) == 0) {
     ri->http_version += 5;   /* Skip "HTTP/" */
     parse_http_headers(&buf, ri);
-    status = MG_TRUE;
+    status = 1;
   }
 
   return status;
@@ -2505,15 +2525,13 @@ static int read_request(FILE *fp, SOCKET sock, SSL *ssl, char *buf, int bufsiz,
 // For given directory path, substitute it to valid index file.
 // Return 0 if index file has been found, -1 if not found.
 // If the file is found, it's stats is returned in stp.
-static bool_t substitute_index_file(struct mg_connection *conn, char *path,
-                                    size_t path_len, struct mgstat *stp) {
-  const char *list;
+static int substitute_index_file(struct mg_connection *conn, char *path,
+                                 size_t path_len, struct mgstat *stp) {
+  const char *list = conn->ctx->config[INDEX_FILES];
   struct mgstat st;
   struct vec filename_vec;
-  size_t n;
-  bool_t found;
-
-  n = strlen(path);
+  size_t n = strlen(path);
+  int found = 0;
 
   // The 'path' given to us points to the directory. Remove all trailing
   // directory separator characters from the end of the path, and
@@ -2525,9 +2543,6 @@ static bool_t substitute_index_file(struct mg_connection *conn, char *path,
 
   // Traverse index files list. For each entry, append it to the given
   // path and see if the file exists. If it exists, break the loop
-  list = conn->ctx->config->index_files;
-  found = MG_FALSE;
-
   while ((list = next_option(list, &filename_vec, NULL)) != NULL) {
 
     // Ignore too long entries that may overflow path buffer
@@ -2541,13 +2556,13 @@ static bool_t substitute_index_file(struct mg_connection *conn, char *path,
     if (mg_stat(path, &st) == 0) {
       // Yes it does, break the loop
       *stp = st;
-      found = MG_TRUE;
+      found = 1;
       break;
     }
   }
 
   // If no index file exists, restore directory path
-  if (found == MG_FALSE) {
+  if (!found) {
     path[n] = '\0';
   }
 
@@ -2555,17 +2570,17 @@ static bool_t substitute_index_file(struct mg_connection *conn, char *path,
 }
 
 // Return True if we should reply 304 Not Modified.
-static bool_t is_not_modified(const struct mg_connection *conn,
-                              const struct mgstat *stp) {
+static int is_not_modified(const struct mg_connection *conn,
+                           const struct mgstat *stp) {
   const char *ims = mg_get_header(conn, "If-Modified-Since");
   return ims != NULL && stp->mtime <= parse_date_string(ims);
 }
 
-static bool_t handle_request_body(struct mg_connection *conn, FILE *fp) {
+static int handle_request_body(struct mg_connection *conn, FILE *fp) {
   const char *expect, *data;
   char buf[BUFSIZ];
   int to_read, nread, data_len;
-  bool_t status = MG_FALSE;
+  int success = 0;
 
   expect = mg_get_header(conn, "Expect");
   assert(fp != NULL);
@@ -2583,8 +2598,8 @@ static bool_t handle_request_body(struct mg_connection *conn, FILE *fp) {
     assert(data_len >= 0);
 
     if (conn->content_len <= (int64_t) data_len) {
-      status = fp == NULL || (push(fp, INVALID_SOCKET, NULL, data,
-            conn->content_len) == conn->content_len) ?  MG_TRUE : MG_FALSE;
+      success = push(fp, INVALID_SOCKET, NULL, data,
+                     conn->content_len) == conn->content_len;
     } else {
       push(fp, INVALID_SOCKET, NULL, data, (int64_t) data_len);
       conn->consumed_content += data_len;
@@ -2601,18 +2616,17 @@ static bool_t handle_request_body(struct mg_connection *conn, FILE *fp) {
         conn->consumed_content += nread;
       }
       if (conn->consumed_content == conn->content_len) {
-        status = MG_TRUE;
+        success = 1;
       }
     }
 
     // Each error code path in this function must send an error
-    if (status != MG_TRUE) {
-      send_http_error(conn, 577, http_500_error,
-          "%s", "Error handling body data");
+    if (!success) {
+      send_http_error(conn, 577, http_500_error, "");
     }
   }
 
-  return status;
+  return success;
 }
 
 #if !defined(NO_CGI)
@@ -2681,7 +2695,7 @@ static void prepare_cgi_environment(struct mg_connection *conn,
 
   get_document_root(conn, &root);
 
-  addenv(blk, "SERVER_NAME=%s", conn->ctx->config->auth_domain);
+  addenv(blk, "SERVER_NAME=%s", conn->ctx->config[AUTHENTICATION_DOMAIN]);
   addenv(blk, "SERVER_ROOT=%.*s", root.len, root.ptr);
   addenv(blk, "DOCUMENT_ROOT=%.*s", root.len, root.ptr);
 
@@ -2750,7 +2764,7 @@ static void prepare_cgi_environment(struct mg_connection *conn,
   }
 
   // Add user-specified variables
-  s = conn->ctx->config->cgi_environment;
+  s = conn->ctx->config[CGI_ENVIRONMENT];
   while ((s = next_option(s, &var_vec, NULL)) != NULL) {
     addenv(blk, "%.*s", var_vec.len, var_vec.ptr);
   }
@@ -2942,7 +2956,7 @@ static void do_ssi_include(struct mg_connection *conn, const char *ssi,
                            char *tag, int include_level) {
   char file_name[BUFSIZ], path[PATH_MAX], *p;
   struct vec root;
-  bool_t is_ssi;
+  int is_ssi;
   FILE *fp;
 
   get_document_root(conn, &root);
@@ -2975,7 +2989,7 @@ static void do_ssi_include(struct mg_connection *conn, const char *ssi,
         tag, path, strerror(ERRNO));
   } else {
     set_close_on_exec(fileno(fp));
-    is_ssi = match_extension(path, conn->ctx->config->ssi_extensions);
+    is_ssi = match_extension(path, conn->ctx->config[SSI_EXTENSIONS]);
     if (is_ssi) {
       send_ssi_file(conn, path, fp, include_level + 1);
     } else {
@@ -3009,12 +3023,12 @@ static void send_ssi_file(struct mg_connection *conn, const char *path,
     return;
   }
 
-  in_ssi_tag = MG_FALSE;
+  in_ssi_tag = 0;
   len = 0;
 
   while ((ch = fgetc(fp)) != EOF) {
     if (in_ssi_tag && ch == '>') {
-      in_ssi_tag = MG_FALSE;
+      in_ssi_tag = 0;
       buf[len++] = (char) ch;
       buf[len] = '\0';
       assert(len <= (int) sizeof(buf));
@@ -3034,14 +3048,14 @@ static void send_ssi_file(struct mg_connection *conn, const char *path,
     } else if (in_ssi_tag) {
       if (len == 5 && memcmp(buf, "<!--#", 5) != 0) {
         // Not an SSI tag
-        in_ssi_tag = MG_FALSE;
+        in_ssi_tag = 0;
       } else if (len == (int) sizeof(buf) - 2) {
         cry(conn, "%s: SSI tag is too large", path);
         len = 0;
       }
       buf[len++] = ch & 0xff;
     } else if (ch == '<') {
-      in_ssi_tag = MG_TRUE;
+      in_ssi_tag = 1;
       if (len > 0) {
         (void) mg_write(conn, buf, len);
       }
@@ -3083,35 +3097,32 @@ static void handle_ssi_file_request(struct mg_connection *conn,
 // and Mongoose must decide what action to take: serve a file, or
 // a directory, or call embedded function, etcetera.
 static void handle_request(struct mg_connection *conn) {
-  struct mg_request_info *ri;
+  struct mg_request_info *ri = &conn->request_info;
   char path[PATH_MAX];
   int uri_len;
   struct mgstat st;
-  mg_callback_t new_request_callback;
 
-  ri = &conn->request_info;
   if ((conn->request_info.query_string = strchr(ri->uri, '?')) != NULL) {
     * conn->request_info.query_string++ = '\0';
   }
   uri_len = strlen(ri->uri);
-  new_request_callback = conn->ctx->config->new_request_handler;
-  (void) url_decode(ri->uri, uri_len, ri->uri, uri_len + 1, MG_FALSE);
+  (void) url_decode(ri->uri, uri_len, ri->uri, uri_len + 1, 0);
   remove_double_dots_and_double_slashes(ri->uri);
   convert_uri_to_file_name(conn, ri->uri, path, sizeof(path));
 
   DEBUG_TRACE(("%s", ri->uri));
-  if (new_request_callback && new_request_callback(conn, ri) == MG_TRUE) {
+  if (call_user(conn, MG_NEW_REQUEST) != NULL) {
     // Do nothing, callback has served the request
   } else if (!check_authorization(conn, path)) {
     send_authorization_request(conn);
   } else if (strstr(path, PASSWORDS_FILE_NAME)) {
     // Do not allow to view passwords files
     send_http_error(conn, 403, "Forbidden", "Access Forbidden");
-  } else if (conn->ctx->config->document_root == NULL) {
+  } else if (conn->ctx->config[DOCUMENT_ROOT] == NULL) {
     send_http_error(conn, 404, "Not Found", "Not Found");
   } else if ((!strcmp(ri->request_method, "PUT") ||
         !strcmp(ri->request_method, "DELETE")) &&
-      (conn->ctx->config->put_delete_passwords_file == NULL ||
+      (conn->ctx->config[PUT_DELETE_PASSWORDS_FILE] == NULL ||
        !is_authorized_for_put(conn))) {
     send_authorization_request(conn);
   } else if (!strcmp(ri->request_method, "PUT")) {
@@ -3130,14 +3141,14 @@ static void handle_request(struct mg_connection *conn) {
         "HTTP/1.1 301 Moved Permanently\r\n"
         "Location: %s/\r\n\r\n", ri->uri);
   } else if (st.is_directory &&
-      substitute_index_file(conn, path, sizeof(path), &st) == MG_FALSE) {
-    if (conn->ctx->config->enable_directory_listing) {
+             !substitute_index_file(conn, path, sizeof(path), &st)) {
+    if (!mg_strcasecmp(conn->ctx->config[ENABLE_DIRECTORY_LISTING], "yes")) {
       handle_directory_request(conn, path);
     } else {
       send_http_error(conn, 403, "Directory Listing Denied",
           "Directory listing denied");
     }
-  } else if (match_extension(path, conn->ctx->config->cgi_extensions)) {
+  } else if (match_extension(path, conn->ctx->config[CGI_EXTENSIONS])) {
     if (strcmp(ri->request_method, "POST") &&
         strcmp(ri->request_method, "GET")) {
       send_http_error(conn, 501, "Not Implemented",
@@ -3145,7 +3156,7 @@ static void handle_request(struct mg_connection *conn) {
     } else {
       handle_cgi_request(conn, path);
     }
-  } else if (match_extension(path, conn->ctx->config->ssi_extensions)) {
+  } else if (match_extension(path, conn->ctx->config[SSI_EXTENSIONS])) {
     handle_ssi_file_request(conn, path);
   } else if (is_not_modified(conn, &st)) {
     send_http_error(conn, 304, "Not Modified", "");
@@ -3163,28 +3174,28 @@ static void close_all_listening_sockets(struct mg_context *ctx) {
   }
 }
 
-static enum mg_error_t set_ports_option(struct mg_context *ctx) {
+static int set_ports_option(struct mg_context *ctx) {
   SOCKET sock;
-  int is_ssl;
+  const char *list = ctx->config[LISTENING_PORTS];
+  int is_ssl, success = 1;
   struct vec vec;
   struct socket *listener;
-  const char *list = ctx->config->listening_ports;
 
-  while ((list = next_option(list, &vec, NULL)) != NULL) {
-    is_ssl = vec.ptr[vec.len - 1] == 's' ? MG_TRUE : MG_FALSE;
+  while (success && (list = next_option(list, &vec, NULL)) != NULL) {
+    is_ssl = vec.ptr[vec.len - 1] == 's';
 
     if ((listener = calloc(1, sizeof(*listener))) == NULL) {
       cry(fc(ctx), "%s", "Too many listeninig sockets");
-      return MG_ERROR;
+      success = 0;
     } else if ((sock = mg_open_listening_port(ctx,
             vec.ptr, &listener->lsa)) == INVALID_SOCKET) {
       cry(fc(ctx), "cannot bind to %.*s", vec.len, vec.ptr);
-      return MG_ERROR;
-    } else if (is_ssl == MG_TRUE && ctx->ssl_ctx == NULL) {
+      success = 0;
+    } else if (is_ssl && ctx->ssl_ctx == NULL) {
       (void) closesocket(sock);
       cry(fc(ctx), "cannot add SSL socket, please specify "
           "-ssl_cert option BEFORE -ports option");
-      return MG_ERROR;
+      success = 0;
     } else {
       listener->sock = sock;
       listener->is_ssl = is_ssl;
@@ -3193,7 +3204,11 @@ static enum mg_error_t set_ports_option(struct mg_context *ctx) {
     }
   }
 
-  return MG_SUCCESS;
+  if (!success) {
+    close_all_listening_sockets(ctx);
+  }
+
+  return success;
 }
 
 static void log_header(const struct mg_connection *conn, const char *header,
@@ -3212,8 +3227,8 @@ static void log_access(const struct mg_connection *conn) {
   FILE *fp;
   char date[64];
 
-  fp = conn->ctx->config->access_log_file == NULL ?  NULL :
-    mg_fopen(conn->ctx->config->access_log_file, "a+");
+  fp = conn->ctx->config[ACCESS_LOG_FILE] == NULL ?  NULL :
+    mg_fopen(conn->ctx->config[ACCESS_LOG_FILE], "a+");
 
   if (fp == NULL)
     return;
@@ -3243,22 +3258,21 @@ static void log_access(const struct mg_connection *conn) {
   (void) fclose(fp);
 }
 
-static bool_t isbyte(int n) {
-  return n >= 0 && n <= 255 ? MG_TRUE : MG_FALSE;
+static int isbyte(int n) {
+  return n >= 0 && n <= 255;
 }
 
 // Verify given socket address against the ACL.
 // Return -1 if ACL is malformed, 0 if address is disallowed, 1 if allowed.
-static enum mg_error_t check_acl(struct mg_context *ctx,
-                                 const struct usa *usa) {
+static int check_acl(struct mg_context *ctx, const struct usa *usa) {
   int a, b, c, d, n, mask, allowed;
   char flag;
   uint32_t acl_subnet, acl_mask, remote_ip;
   struct vec vec;
-  const char *list = ctx->config->acl;
+  const char *list = ctx->config[ACCESS_CONTROL_LIST];
 
   if (list == NULL) {
-    return MG_SUCCESS;
+    return 1;
   }
 
   (void) memcpy(&remote_ip, &usa->u.sin.sin_addr, sizeof(remote_ip));
@@ -3271,18 +3285,18 @@ static enum mg_error_t check_acl(struct mg_context *ctx,
 
     if (sscanf(vec.ptr, "%c%d.%d.%d.%d%n", &flag, &a, &b, &c, &d, &n) != 5) {
       cry(fc(ctx), "%s: subnet must be [+|-]x.x.x.x[/x]", __func__);
-      return MG_ERROR;
+      return 0;
     } else if (flag != '+' && flag != '-') {
       cry(fc(ctx), "%s: flag must be + or -: [%s]", __func__, vec.ptr);
-      return MG_ERROR;
+      return 0;
     } else if (!isbyte(a)||!isbyte(b)||!isbyte(c)||!isbyte(d)) {
       cry(fc(ctx), "%s: bad ip address: [%s]", __func__, vec.ptr);
-      return MG_ERROR;
+      return 0;
     } else if (sscanf(vec.ptr + n, "/%d", &mask) == 0) {
       // Do nothing, no mask specified
     } else if (mask < 0 || mask > 32) {
       cry(fc(ctx), "%s: bad subnet mask: %d [%s]", __func__, n, vec.ptr);
-      return MG_ERROR;
+      return 0;
     }
 
     acl_subnet = (a << 24) | (b << 16) | (c << 8) | d;
@@ -3293,7 +3307,7 @@ static enum mg_error_t check_acl(struct mg_context *ctx,
     }
   }
 
-  return allowed == '+' ? MG_SUCCESS : MG_ERROR;
+  return allowed == '+';
 }
 
 static void add_to_set(SOCKET fd, fd_set *set, int *max_fd) {
@@ -3304,13 +3318,13 @@ static void add_to_set(SOCKET fd, fd_set *set, int *max_fd) {
 }
 
 #if !defined(_WIN32)
-static enum mg_error_t set_uid_option(struct mg_context *ctx) {
+static int set_uid_option(struct mg_context *ctx) {
   struct passwd *pw;
-  const char *uid = ctx->config->uid;
-  enum mg_error_t error;
+  const char *uid = ctx->config[RUN_AS_USER];
+  int success = 0;
 
   if (uid == NULL) {
-    error = MG_SUCCESS;
+    success = 1;
   } else {
     if ((pw = getpwnam(uid)) == NULL) {
       cry(fc(ctx), "%s: unknown user [%s]", __func__, uid);
@@ -3319,11 +3333,11 @@ static enum mg_error_t set_uid_option(struct mg_context *ctx) {
     } else if (setuid(pw->pw_uid) == -1) {
       cry(fc(ctx), "%s: setuid(%s): %s", __func__, uid, strerror(errno));
     } else {
-      error = MG_SUCCESS;
+      success = 1;
     }
   }
 
-  return error;
+  return success;
 }
 #endif // !_WIN32
 
@@ -3346,15 +3360,15 @@ static unsigned long ssl_id_callback(void) {
   return (unsigned long) pthread_self();
 }
 
-static bool_t load_dll(struct mg_context *ctx, const char *dll_name,
-                       struct ssl_func *sw) {
+static int load_dll(struct mg_context *ctx, const char *dll_name,
+                    struct ssl_func *sw) {
   union {void *p; void (*fp)(void);} u;
   void  *dll_handle;
   struct ssl_func *fp;
 
   if ((dll_handle = dlopen(dll_name, RTLD_LAZY)) == NULL) {
     cry(fc(ctx), "%s: cannot load %s", __func__, dll_name);
-    return MG_FALSE;
+    return 0;
   }
 
   for (fp = sw; fp->name != NULL; fp++) {
@@ -3368,28 +3382,28 @@ static bool_t load_dll(struct mg_context *ctx, const char *dll_name,
 #endif /* _WIN32 */
     if (u.fp == NULL) {
       cry(fc(ctx), "%s: cannot find %s", __func__, fp->name);
-      return MG_FALSE;
+      return 0;
     } else {
       fp->ptr = u.fp;
     }
   }
 
-  return MG_TRUE;
+  return 1;
 }
 
 // Dynamically load SSL library. Set up ctx->ssl_ctx pointer.
-static enum mg_error_t set_ssl_option(struct mg_context *ctx) {
+static int set_ssl_option(struct mg_context *ctx) {
   SSL_CTX *CTX;
   int i, size;
-  const char *pem = ctx->config->ssl_certificate;
+  const char *pem = ctx->config[SSL_CERTIFICATE];
 
   if (pem == NULL) {
-    return MG_SUCCESS;
+    return 1;
   }
 
-  if (load_dll(ctx, SSL_LIB, ssl_sw) == MG_FALSE ||
-      load_dll(ctx, CRYPTO_LIB, crypto_sw) == MG_FALSE) {
-    return MG_ERROR;
+  if (!load_dll(ctx, SSL_LIB, ssl_sw) ||
+      !load_dll(ctx, CRYPTO_LIB, crypto_sw)) {
+    return 0;
   }
 
   // Initialize SSL crap
@@ -3398,18 +3412,18 @@ static enum mg_error_t set_ssl_option(struct mg_context *ctx) {
 
   if ((CTX = SSL_CTX_new(SSLv23_server_method())) == NULL) {
     cry(fc(ctx), "SSL_CTX_new error: %s", ssl_error());
-  } else if (ctx->config->ssl_password_handler != NULL) {
-    SSL_CTX_set_default_passwd_cb(CTX, ctx->config->ssl_password_handler);
+  } else if (ctx->user_callback != NULL) {
+    ctx->user_callback(MG_INIT_SSL, (struct mg_connection *) CTX, NULL);
   }
 
   if (CTX != NULL && SSL_CTX_use_certificate_file(CTX, pem,
         SSL_FILETYPE_PEM) == 0) {
     cry(fc(ctx), "%s: cannot open %s: %s", __func__, pem, ssl_error());
-    return MG_ERROR;
+    return 0;
   } else if (CTX != NULL && SSL_CTX_use_PrivateKey_file(CTX, pem,
         SSL_FILETYPE_PEM) == 0) {
     cry(fc(ctx), "%s: cannot open %s: %s", NULL, pem, ssl_error());
-    return MG_ERROR;
+    return 0;
   }
 
   // Initialize locking callbacks, needed for thread safety.
@@ -3417,7 +3431,7 @@ static enum mg_error_t set_ssl_option(struct mg_context *ctx) {
   size = sizeof(pthread_mutex_t) * CRYPTO_num_locks();
   if ((ssl_mutexes = (pthread_mutex_t *) malloc(size)) == NULL) {
     cry(fc(ctx), "%s: cannot allocate mutexes: %s", __func__, ssl_error());
-    return MG_ERROR;
+    return 0;
   }
 
   for (i = 0; i < CRYPTO_num_locks(); i++) {
@@ -3430,24 +3444,25 @@ static enum mg_error_t set_ssl_option(struct mg_context *ctx) {
   // Done with everything. Save the context.
   ctx->ssl_ctx = CTX;
 
-  return MG_SUCCESS;
+  return 1;
 }
 #endif // !NO_SSL
 
-static enum mg_error_t set_gpass_option(struct mg_context *ctx) {
+static int set_gpass_option(struct mg_context *ctx) {
   struct mgstat mgstat;
-  const char *path = ctx->config->global_passwords_file;
-  return path == NULL || mg_stat(path, &mgstat) == 0 ?  MG_SUCCESS : MG_ERROR;
+  const char *path = ctx->config[GLOBAL_PASSWORDS_FILE];
+  return path == NULL || mg_stat(path, &mgstat) == 0;
 }
 
-static enum mg_error_t set_acl_option(struct mg_context *ctx) {
+static int set_acl_option(struct mg_context *ctx) {
   struct usa fake;
   return check_acl(ctx, &fake);
 }
 
-static bool_t verify_document_root(struct mg_context *ctx, const char *root) {
+static int verify_document_root(struct mg_context *ctx) {
   char path[PATH_MAX], *p;
   struct mgstat buf;
+  const char *root = ctx->config[DOCUMENT_ROOT];
 
   if ((p = strchr(root, ',')) == NULL) {
     mg_strlcpy(path, root, sizeof(path));
@@ -3457,9 +3472,9 @@ static bool_t verify_document_root(struct mg_context *ctx, const char *root) {
 
   if (mg_stat(path, &buf) != 0) {
     cry(fc(ctx), "Invalid root directory: \"%s\"", root);
-    return MG_FALSE;
+    return 0;
   }
-  return MG_TRUE;
+  return 1;
 }
 
 static void reset_per_request_attributes(struct mg_connection *conn) {
@@ -3562,7 +3577,7 @@ static void process_new_connection(struct mg_connection *conn) {
 }
 
 // Worker threads take accepted socket from the queue
-static bool_t consume_socket(struct mg_context *ctx, struct socket *sp) {
+static int consume_socket(struct mg_context *ctx, struct socket *sp) {
   (void) pthread_mutex_lock(&ctx->mutex);
   DEBUG_TRACE(("going idle"));
 
@@ -3574,7 +3589,7 @@ static bool_t consume_socket(struct mg_context *ctx, struct socket *sp) {
   // If this happens, it is time to exit.
   if (ctx->stop_flag) {
     (void) pthread_mutex_unlock(&ctx->mutex);
-    return MG_FALSE;
+    return 0;
   }
   assert(ctx->sq_head > ctx->sq_tail);
 
@@ -3592,7 +3607,7 @@ static bool_t consume_socket(struct mg_context *ctx, struct socket *sp) {
   (void) pthread_cond_signal(&ctx->sq_empty);
   (void) pthread_mutex_unlock(&ctx->mutex);
 
-  return MG_TRUE;
+  return 1;
 }
 
 static void worker_thread(struct mg_context *ctx) {
@@ -3661,14 +3676,14 @@ static void produce_socket(struct mg_context *ctx, const struct socket *sp) {
 static void accept_new_connection(const struct socket *listener,
                                   struct mg_context *ctx) {
   struct socket accepted;
-  bool_t allowed;
+  int allowed;
 
   accepted.rsa.len = sizeof(accepted.rsa.u.sin);
   accepted.lsa = listener->lsa;
   accepted.sock = accept(listener->sock, &accepted.rsa.u.sa, &accepted.rsa.len);
   if (accepted.sock != INVALID_SOCKET) {
-    allowed = check_acl(ctx, &accepted.rsa) == MG_SUCCESS;
-    if (allowed == MG_SUCCESS) {
+    allowed = check_acl(ctx, &accepted.rsa);
+    if (allowed) {
       // Put accepted socket structure into the queue
       DEBUG_TRACE(("accepted socket %d", accepted.sock));
       accepted.is_ssl = listener->is_ssl;
@@ -3729,11 +3744,6 @@ static void master_thread(struct mg_context *ctx) {
   }
   (void) pthread_mutex_unlock(&ctx->mutex);
 
-  // Deallocate SSL context
-  if (ctx->ssl_ctx != NULL) {
-    SSL_CTX_free(ctx->ssl_ctx);
-  }
-
   // All threads exited, no sync is needed. Destroy mutex and condvars
   (void) pthread_mutex_destroy(&ctx->mutex);
   (void) pthread_cond_destroy(&ctx->cond);
@@ -3746,6 +3756,24 @@ static void master_thread(struct mg_context *ctx) {
   DEBUG_TRACE(("exiting"));
 }
 
+static void free_context(struct mg_context *ctx) {
+  int i;
+
+  // Deallocate config parameters
+  for (i = 0; i < NUM_OPTIONS; i++) {
+    if (ctx->config[i] != NULL)
+      free(ctx->config[i]);
+  }
+
+  // Deallocate SSL context
+  if (ctx->ssl_ctx != NULL) {
+    SSL_CTX_free(ctx->ssl_ctx);
+  }
+
+  // Deallocate context itself
+  free(ctx);
+}
+
 void mg_stop(struct mg_context *ctx) {
   ctx->stop_flag = 1;
 
@@ -3753,15 +3781,16 @@ void mg_stop(struct mg_context *ctx) {
   while (ctx->stop_flag != 2) {
     (void) sleep(0);
   }
-  free(ctx);
+  free_context(ctx);
 
 #if defined(_WIN32)
   (void) WSACleanup();
 #endif // _WIN32
 }
 
-struct mg_context * mg_start(const struct mg_config *config) {
-  struct mg_context *ctx, fake_ctx;
+struct mg_context *mg_start(mg_callback_t user_callback, const char **options) {
+  struct mg_context *ctx;
+  const char *name, *value;
   int i;
 
 #if defined(_WIN32)
@@ -3769,35 +3798,52 @@ struct mg_context * mg_start(const struct mg_config *config) {
   WSAStartup(MAKEWORD(2,2), &data);
 #endif // _WIN32
 
-  // TODO(lsm): make a copy of the config
-  fake_ctx.config = config;
+  // Allocate context and initialize reasonable general case defaults.
+  // TODO(lsm): do proper error handling here.
+  ctx = calloc(1, sizeof(*ctx));
+  ctx->user_callback = user_callback;
 
-  if (config->listening_ports == NULL ||
-      config->num_threads == NULL ||
-      config->auth_domain == NULL) {
-    cry(fc(&fake_ctx), "Please specify "
-        "num_threads, listening_ports, auth_domain");
-    return NULL;
-  } else if (config->document_root != NULL &&
-      verify_document_root(&fake_ctx, config->document_root) != MG_TRUE) {
-    cry(fc(&fake_ctx), "Invalid root directory: \"%s\"", config->document_root);
-    return NULL;
-  } else if ((ctx = calloc(1, sizeof(*ctx))) == NULL) {
-    cry(fc(&fake_ctx), "Cannot allocate mongoose context");
+  ctx->config[DOCUMENT_ROOT] = mg_strdup(".");
+  ctx->config[LISTENING_PORTS] = mg_strdup("8080");
+  ctx->config[ENABLE_DIRECTORY_LISTING] = mg_strdup("yes");
+  ctx->config[ENABLE_KEEP_ALIVE] = mg_strdup("no");
+  ctx->config[AUTHENTICATION_DOMAIN] = mg_strdup("mydomain.com");
+  ctx->config[INDEX_FILES] = mg_strdup("index.html,index.htm,index.cgi");
+  ctx->config[CGI_EXTENSIONS] = mg_strdup(".cgi,.pl,.php");
+  ctx->config[SSI_EXTENSIONS] = mg_strdup(".shtml,.shtm");
+  ctx->config[NUM_THREADS] = mg_strdup("10");
+
+  while ((name = *options++) != NULL) {
+    if ((i = get_option_index(name)) == -1) {
+      cry(fc(ctx), "Invalid option: %s", name);
+      free_context(ctx);
+      return NULL;
+    } else if ((value = *options++) == NULL) {
+      cry(fc(ctx), "%s: option value cannot be NULL", name);
+      free_context(ctx);
+      return NULL;
+    }
+    if (ctx->config[i] != NULL) {
+      free(ctx->config[i]);
+    }
+    ctx->config[i] = mg_strdup(value);
+  }
+
+  if (!verify_document_root(ctx)) {
+    free_context(ctx);
     return NULL;
   }
-  ctx->config = config;
 
   // NOTE(lsm): order is important here. SSL certificates must
   // be initialized before listening ports. UID must be set last.
-  if (set_ssl_option(ctx) == MG_ERROR ||
-      set_ports_option(ctx) == MG_ERROR ||
-      set_gpass_option(ctx) == MG_ERROR ||
+  if (!set_ssl_option(ctx) ||
+      !set_ports_option(ctx) ||
+      !set_gpass_option(ctx) ||
 #if !defined(_WIN32)
-      set_uid_option(ctx) == MG_ERROR ||
+      !set_uid_option(ctx) ||
 #endif
-      set_acl_option(ctx) == MG_ERROR) {
-    free(ctx);
+      !set_acl_option(ctx)) {
+    free_context(ctx);
     return NULL;
   }
 
@@ -3816,7 +3862,7 @@ struct mg_context * mg_start(const struct mg_config *config) {
   start_thread(ctx, (mg_thread_func_t) master_thread, ctx);
 
   // Start worker threads
-  for (i = 0; i < atoi(ctx->config->num_threads); i++) {
+  for (i = 0; i < atoi(ctx->config[NUM_THREADS]); i++) {
     if (start_thread(ctx, (mg_thread_func_t) worker_thread, ctx) != 0) {
       cry(fc(ctx), "Cannot start worker thread: %d", ERRNO);
     } else {
diff --git a/mongoose.h b/mongoose.h
index 228196da..7ab06978 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -29,8 +29,7 @@ struct mg_context;     // Handle for the HTTP service itself
 struct mg_connection;  // Handle for the individual connection
 
 
-// This structure contains full information about the HTTP request.
-// It is passed to the user-specified callback function as a parameter.
+// This structure contains information about the HTTP request.
 struct mg_request_info {
   char *request_method;  // "GET", "POST", etc
   char *uri;             // URL-decoded URI
@@ -40,7 +39,7 @@ struct mg_request_info {
   char *log_message;     // Mongoose error log message
   long remote_ip;        // Client's IP address
   int remote_port;       // Client's port
-  int status_code;       // HTTP status code
+  int status_code;       // HTTP reply status code
   int is_ssl;            // 1 if SSL-ed, 0 if not
   int num_headers;       // Number of headers
   struct mg_header {
@@ -49,65 +48,57 @@ struct mg_request_info {
   } http_headers[64];    // Maximum 64 headers
 };
 
-// User-defined handler function. It must return MG_SUCCESS or MG_ERROR.
-//
-// If handler returns MG_SUCCESS, that means that handler has processed the
-// request by sending appropriate HTTP reply to the client. Mongoose treats
-// the request as served.
-//
-// If callback returns MG_ERROR, that means that callback has not processed
-// the request. Handler must not send any data to the client in this case.
-// Mongoose proceeds with request handling as if nothing happened.
-//
-// NOTE: ssl_password_handler must have the following prototype:
-//      int (*)(char *, int, int, void *)
-// Refer to OpenSSL documentation for more details.
-enum mg_error_t {
-  MG_ERROR,
-  MG_SUCCESS,
-  MG_NOT_FOUND,
-  MG_BUFFER_TOO_SMALL
+// Various events on which user-defined function is called by Mongoose.
+enum mg_event {
+  MG_NEW_REQUEST,   // New HTTP request has arrived from the client
+  MG_HTTP_ERROR,    // HTTP error must be returned to the client
+  MG_EVENT_LOG,     // Mongoose logs an event, request_info.log_message
+  MG_INIT_SSL,      // Mongoose initializes SSL. Instead of mg_connection *,
+                    // SSL context is passed to the callback function.
 };
 
-typedef enum mg_error_t (*mg_callback_t)(struct mg_connection *,
-    const struct mg_request_info *);
-
-// This structure describes Mongoose configuration.
-struct mg_config {
-  char *document_root;
-  char *index_files;
-  char *ssl_certificate;
-  char *listening_ports;
-  char *cgi_extensions;
-  char *cgi_interpreter;
-  char *cgi_environment;
-  char *ssi_extensions;
-  char *auth_domain;
-  char *protect;
-  char *global_passwords_file;
-  char *put_delete_passwords_file;
-  char *access_log_file;
-  char *error_log_file;
-  char *acl;
-  char *uid;
-  char *mime_types;
-  char *enable_directory_listing;
-  char *num_threads;
-
-  mg_callback_t new_request_handler;
-  mg_callback_t http_error_handler;
-  mg_callback_t event_log_handler;
-  mg_callback_t ssl_password_handler;
-};
-
-
-// Start the web server.
+// Prototype for the user-defined function. Mongoose calls this function
+// on every event mentioned above.
 //
-// This must be the first function called by the application.
-// It creates a serving thread, and returns a context structure that
-// can be used to stop the server.
-// After calling mg_start(), configuration data must not be changed.
-struct mg_context *mg_start(const struct mg_config *);
+// Parameters:
+//   event: which event has been triggered.
+//   conn: opaque connection handler. Could be used to read, write data to the
+//         client, etc. See functions below that accept "mg_connection *".
+//   request_info: Information about HTTP request.
+//
+// Return:
+//   If handler returns non-NULL, that means that handler has processed the
+//   request by sending appropriate HTTP reply to the client. Mongoose treats
+//   the request as served.
+//   If callback returns NULL, that means that callback has not processed
+//   the request. Handler must not send any data to the client in this case.
+//   Mongoose proceeds with request handling as if nothing happened.
+typedef void * (*mg_callback_t)(enum mg_event event,
+                                struct mg_connection *conn,
+                                struct mg_request_info *request_info);
+  
+
+// Start web server.
+//
+// Parameters:
+//   callback: user defined event handling function or NULL.
+//   options: NULL terminated list of option_name, option_value pairs that
+//            specify Mongoose configuration parameters.
+//
+// Example:
+//   const char *options[] = {
+//     "document_root", "/var/www",
+//     "listening_ports", "80,443s",
+//     NULL
+//   };
+//   struct mg_context *ctx = mg_start(&my_func, options);
+//
+// Please refer to http://code.google.com/p/mongoose/wiki/MongooseManual
+// for the list of valid option and their possible values.
+//
+// Return:
+//   web server context, or NULL on error.
+struct mg_context *mg_start(mg_callback_t callback, const char **options);
 
 
 // Stop the web server.
@@ -118,6 +109,19 @@ struct mg_context *mg_start(const struct mg_config *);
 void mg_stop(struct mg_context *);
 
 
+// Get the value of particular configuration parameter.
+// The value returned is read-only. Mongoose 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 valid configuration options.
+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
@@ -129,9 +133,9 @@ void mg_stop(struct mg_context *);
 // If password is NULL, entry is deleted.
 //
 // Return:
-//  MG_ERROR, MG_SUCCESS
-enum mg_error_t mg_modify_passwords_file(struct mg_context *ctx, 
-    const char *file_name, const char *user, const char *password);
+//   1 on success, 0 on error.
+int mg_modify_passwords_file(struct mg_context *ctx, 
+    const char *passwords_file_name, const char *user, const char *password);
 
 // Send data to the client.
 int mg_write(struct mg_connection *, const void *buf, size_t len);
@@ -160,32 +164,35 @@ const char *mg_get_header(const struct mg_connection *, const char *name);
 
 // Get a value of particular form variable.
 //
-// Either request_info->query_string or read POST data can be scanned.
-// mg_get_qsvar() is convenience method to get variable from the query string.
-// Destination buffer is guaranteed to be '\0' - terminated. In case of
-// failure, dst[0] == '\0'.
+// 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
+//   buf: destination buffer for the decoded variable
+//   buf_len: length of the destination buffer
 //
 // Return:
-//  MG_SUCCESS    Variable value was successfully copied in the buffer.
-//  MG_NOT_FOUND  Requested variable not found.
-//  MG_BUFFER_TOO_SMALL  Destination buffer is too small to hold the value.
-enum mg_error_t mg_get_var(const char *data, size_t data_len,
-    const char *var_name, char *buf, size_t buf_len);
-enum mg_error_t mg_get_qsvar(const struct mg_request_info *,
+//   On success, length of the decoded variable.
+//   On error, -1 (variable not found, or destination buffer is too small).
+//
+// Destination buffer is guaranteed to be '\0' - terminated. In case of
+// failure, dst[0] == '\0'.
+int mg_get_var(const char *data, size_t data_len,
     const char *var_name, char *buf, size_t buf_len);
 
 // 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 occurences of the same
-// parameter. This function returns only first occurance.
+// failure, dst[0] == '\0'. Note that RFC allows many occurrences of the same
+// parameter. This function returns only first occurrence.
 //
 // Return:
-//  MG_SUCCESS    Cookie parameter was successfully copied in the buffer.
-//  MG_NOT_FOUND  Either "Cookie:" header is not present at all, or the
-//                requested parameter is not found.
-//  MG_BUFFER_TOO_SMALL  Destination buffer is too small to hold the value.
-enum mg_error_t mg_get_cookie(const struct mg_connection *,
+//   On success, value length.
+//   On error, -1 (either "Cookie:" header is not present at all, or the
+//   requested parameter is not found, or destination buffer is too small
+//   to hold the value).
+int mg_get_cookie(const struct mg_connection *,
     const char *cookie_name, char *buf, size_t buf_len);
 
 
diff --git a/test/embed.c b/test/embed.c
index 9efb8629..2d268cab 100644
--- a/test/embed.c
+++ b/test/embed.c
@@ -1,85 +1,92 @@
-/*
- * Copyright (c) 2004-2009 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.
- *
- * $Id: embed.c 471 2009-08-30 14:30:21Z valenok $
- * Unit test for the mongoose web server. Tests embedded API.
- */
+// Copyright (c) 2004-2009 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.
+//
+// Unit test for the mongoose web server. Tests embedded API.
 
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
 #include "mongoose.h"
 
 #if !defined(LISTENING_PORT)
 #define LISTENING_PORT	"23456"
-#endif /* !LISTENING_PORT */
+#endif
 
 static const char *standard_reply =	"HTTP/1.1 200 OK\r\n"
-					"Content-Type: text/plain\r\n"
-					"Connection: close\r\n\r\n";
+  "Content-Type: text/plain\r\n"
+  "Connection: close\r\n\r\n";
 
-static void
-test_get_var(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
-	char *value;
+static void test_get_var(struct mg_connection *conn,
+                         const struct mg_request_info *ri) {
+	char *var, *buf;
+  size_t buf_len;
+  const char *cl;
+  int var_len;
 
 	mg_printf(conn, "%s", standard_reply);
 
-	value = mg_get_var(conn, "my_var");
-	if (value != NULL) {
-		mg_printf(conn, "Value: [%s]\n", value);
-		mg_printf(conn, "Value size: [%u]\n", (unsigned) strlen(value));
-		free(value);
-	}
+  buf_len = 0;
+  var = buf = NULL;
+  cl = mg_get_header(conn, "Content-Length");
+  mg_printf(conn, "cl: %p\n", cl);
+  if (!strcmp(ri->request_method, "POST") && cl != NULL) {
+    buf_len = atoi(cl);
+    buf = malloc(buf_len);
+    mg_read(conn, buf, buf_len);
+  } else if (ri->query_string != NULL) {
+    buf_len = strlen(ri->query_string);
+    buf = malloc(buf_len + 1);
+    strcpy(buf, ri->query_string);
+  }
+  var = malloc(buf_len + 1);
+	var_len = mg_get_var(buf, buf_len, "my_var", var, buf_len + 1);
+  mg_printf(conn, "Value: [%s]\n", var);
+  mg_printf(conn, "Value size: [%d]\n", var_len);
+  free(buf);
+  free(var);
 }
 
-static void
-test_get_header(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
+static void test_get_header(struct mg_connection *conn,
+                            const struct mg_request_info *ri) {
 	const char *value;
+  int	i;
 
 	mg_printf(conn, "%s", standard_reply);
-
-	{
-		int	i;
-		printf("HTTP headers: %d\n", ri->num_headers);
-		for (i = 0; i < ri->num_headers; i++)
-			printf("[%s]: [%s]\n",
-					ri->http_headers[i].name,
-					ri->http_headers[i].value);
-	}
-
+  printf("HTTP headers: %d\n", ri->num_headers);
+  for (i = 0; i < ri->num_headers; i++) {
+    printf("[%s]: [%s]\n", ri->http_headers[i].name, ri->http_headers[i].value);
+  }
 
 	value = mg_get_header(conn, "Host");
-	if (value != NULL)
+	if (value != NULL) {
 		mg_printf(conn, "Value: [%s]", value);
+  }
 }
 
-static void
-test_get_ri(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
+static void test_get_request_info(struct mg_connection *conn,
+                                  const struct mg_request_info *ri) {
 	int	i;
 
 	mg_printf(conn, "%s", standard_reply);
@@ -88,110 +95,79 @@ test_get_ri(struct mg_connection *conn, const struct mg_request_info *ri,
 	mg_printf(conn, "URI: [%s]\n", ri->uri);
 	mg_printf(conn, "HTTP version: [%s]\n", ri->http_version);
 
-	for (i = 0; i < ri->num_headers; i++)
+	for (i = 0; i < ri->num_headers; i++) {
 		mg_printf(conn, "HTTP header [%s]: [%s]\n",
 			 ri->http_headers[i].name,
 			 ri->http_headers[i].value);
-
+  }
 
 	mg_printf(conn, "Query string: [%s]\n",
 			ri->query_string ? ri->query_string: "");
-	mg_printf(conn, "POST data: [%.*s]\n",
-			ri->post_data_len, ri->post_data);
 	mg_printf(conn, "Remote IP: [%lu]\n", ri->remote_ip);
 	mg_printf(conn, "Remote port: [%d]\n", ri->remote_port);
 	mg_printf(conn, "Remote user: [%s]\n",
 			ri->remote_user ? ri->remote_user : "");
 }
 
-static void
-test_error(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
-	const char *value;
-
+static void test_error(struct mg_connection *conn,
+                       const struct mg_request_info *ri) {
 	mg_printf(conn, "HTTP/1.1 %d XX\r\n"
 		"Conntection: close\r\n\r\n", ri->status_code);
 	mg_printf(conn, "Error: [%d]", ri->status_code);
 }
 
-static void
-test_user_data(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
-	const char *value;
+static void test_post(struct mg_connection *conn,
+                      const struct mg_request_info *ri) {
+  const char *cl;
+  char *buf;
+  int len;
 
 	mg_printf(conn, "%s", standard_reply);
-	mg_printf(conn, "User data: [%d]", * (int *) user_data);
+  if (strcmp(ri->request_method, "POST") == 0 &&
+      (cl = mg_get_header(conn, "Content-Length")) != NULL) {
+    len = atoi(cl);
+    if ((buf = malloc(len)) != NULL) {
+      mg_write(conn, buf, len);
+      free(buf);
+    }
+  }
 }
 
-static void
-test_protect(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
-	const char	*allowed_user = * (char **) user_data;
-	const char	*remote_user = ri->remote_user;
-	int		allowed;
+static const struct test_config {
+  enum mg_event event;
+  const char *uri;
+  void (*func)(struct mg_connection *, const struct mg_request_info *);
+} test_config[] = {
+  {MG_NEW_REQUEST, "/test_get_header", &test_get_header},
+  {MG_NEW_REQUEST, "/test_get_var", &test_get_var},
+  {MG_NEW_REQUEST, "/test_get_request_info", &test_get_request_info},
+  {MG_NEW_REQUEST, "/test_post", &test_post},
+  {MG_HTTP_ERROR, "", &test_error},
+  {0, NULL, NULL}
+};
 
-	allowed = remote_user != NULL && !strcmp(allowed_user, remote_user);
+static void *callback(enum mg_event event,
+                      struct mg_connection *conn,
+                      struct mg_request_info *request_info) {
+  int i;
 
-	* (long *) user_data = allowed ? 1 : 0;
+  for (i = 0; test_config[i].uri != NULL; i++) {
+    if (event == test_config[i].event &&
+        (event == MG_HTTP_ERROR ||
+         !strcmp(request_info->uri, test_config[i].uri))) {
+      test_config[i].func(conn, request_info);
+      return "processed";
+    }
+  }
+
+  return NULL;
 }
 
-static void
-test_post(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
-	mg_printf(conn, "%s", standard_reply);
-	mg_write(conn, ri->post_data, ri->post_data_len);
-}
-
-static void
-test_put(struct mg_connection *conn, const struct mg_request_info *ri,
-		void *user_data)
-{
-	mg_printf(conn, "%s", standard_reply);
-	mg_write(conn, ri->post_data, ri->post_data_len);
-}
-
-static void
-test_remove_callback(struct mg_connection *conn,
-		const struct mg_request_info *ri, void *user_data)
-{
-	struct mg_context	*ctx = (struct mg_context *) user_data;
-	const char		*uri_regex = "/foo/*";
-
-	mg_printf(conn, "%sRemoving callbacks bound to [%s]",
-			standard_reply, uri_regex);
-
-	/* Un-bind bound callback */
-	mg_set_uri_callback(ctx, uri_regex, NULL, NULL);
-}
-
-int main(void)
-{
-	int			user_data = 1234;
+int main(void) {
 	struct mg_context	*ctx;
+  const char *options[] = {"listening_ports", LISTENING_PORT, NULL};
 
-	ctx = mg_start();
-	mg_set_option(ctx, "ports", LISTENING_PORT);
-
-	mg_set_uri_callback(ctx, "/test_get_header", &test_get_header, NULL);
-	mg_set_uri_callback(ctx, "/test_get_var", &test_get_var, NULL);
-	mg_set_uri_callback(ctx, "/test_get_request_info", &test_get_ri, NULL);
-	mg_set_uri_callback(ctx, "/foo/*", &test_get_ri, NULL);
-	mg_set_uri_callback(ctx, "/test_user_data",
-			&test_user_data, &user_data);
-	mg_set_uri_callback(ctx, "/p", &test_post, NULL);
-	mg_set_uri_callback(ctx, "/put", &test_put, NULL);
-	mg_set_uri_callback(ctx, "/test_remove_callback",
-			&test_remove_callback, ctx);
-
-	mg_set_error_callback(ctx, 404, &test_error, NULL);
-	mg_set_error_callback(ctx, 0, &test_error, NULL);
-
-	mg_set_auth_callback(ctx, "/foo/secret", &test_protect, (void *) "joe");
-
-	for (;;)
-		(void) getchar();
+	ctx = mg_start(callback, options);
+  pause();
+  return 0;
 }
diff --git a/test/test.pl b/test/test.pl
index 99bf2287..7ce1e4b1 100644
--- a/test/test.pl
+++ b/test/test.pl
@@ -146,7 +146,7 @@ if (scalar(@ARGV) > 0 and $ARGV[0] eq 'embedded') {
 }
 
 # Make sure we load config file if no options are given
-write_file($config, "ports 12345\naccess_log access.log\n");
+write_file($config, "listening_ports 12345\naccess_log_file access.log\n");
 spawn($exe);
 my $saved_port = $port;
 $port = 12345;
@@ -156,11 +156,13 @@ unlink $config;
 kill_spawned_child();
 
 # Spawn the server on port $port
-my $cmd = "$exe -ports $port -access_log access.log -error_log debug.log ".
-"-cgi_env CGI_FOO=foo,CGI_BAR=bar,CGI_BAZ=baz " .
-"-mime_types .bar=foo/bar,.tar.gz=blah,.baz=foo " .
-"-root $root,/aiased=/etc/,/ta=$test_dir";
-$cmd .= ' -cgi_interp perl' if on_windows();
+my $cmd = "$exe -listening_ports $port -access_log_file access.log ".
+"-error_log_file debug.log ".
+"-cgi_environment CGI_FOO=foo,CGI_BAR=bar,CGI_BAZ=baz " .
+"-extra_mime_types .bar=foo/bar,.tar.gz=blah,.baz=foo " .
+'-put_delete_passwords_file test/passfile ' .
+"-document_root $root,/aiased=/etc/,/ta=$test_dir";
+$cmd .= ' -cgi_interpreter perl' if on_windows();
 spawn($cmd);
 
 # Try to overflow: Send very long request
@@ -349,15 +351,12 @@ unless (scalar(@ARGV) > 0 and $ARGV[0] eq "basic_tests") {
   $content =~ /^b:a:\w+$/gs or fail("Bad content of the passwd file");
   unlink $path;
 
-  kill_spawned_child();
   do_PUT_test();
-  #do_embedded_test();
+  kill_spawned_child();
+  do_embedded_test();
 }
 
 sub do_PUT_test {
-  $cmd .= ' -auth_PUT test/passfile';
-  spawn($cmd);
-
   my $auth_header = "Authorization: Digest  username=guest, ".
   "realm=mydomain.com, nonce=1145872809, uri=/put.txt, ".
   "response=896327350763836180c61d87578037d9, qop=auth, ".
@@ -379,16 +378,14 @@ sub do_PUT_test {
   o("PUT /put.txt HTTP/1.0\nExpect: 100-continue\nContent-Length: 4\n".
     "$auth_header\nabcd",
     "HTTP/1.1 100 Continue.+HTTP/1.1 200", 'PUT 100-Continue');
-  kill_spawned_child();
 }
 
 sub do_embedded_test {
-  my $cmd = "cc -o $embed_exe $root/embed.c mongoose.c -I. ".
-  "-DNO_SSL -lpthread -DLISTENING_PORT=\\\"$port\\\"";
+  my $cmd = "cc -W -Wall -o $embed_exe $root/embed.c mongoose.c -I. ".
+  "-pthread -DLISTENING_PORT=\\\"$port\\\"";
   if (on_windows()) {
     $cmd = "cl $root/embed.c mongoose.c /I. /nologo ".
-    "/DNO_SSL /DLISTENING_PORT=\\\"$port\\\" ".
-    "/link /out:$embed_exe.exe ws2_32.lib ";
+    "/DLISTENING_PORT=\\\"$port\\\" /link /out:$embed_exe.exe ws2_32.lib ";
   }
   print $cmd, "\n";
   system($cmd) == 0 or fail("Cannot compile embedded unit test");
@@ -415,30 +412,24 @@ sub do_embedded_test {
 
   # + in form data MUST be decoded to space
   o("POST /test_get_var HTTP/1.0\nContent-Length: 10\n\n".
-    "my_var=b+c", 'Value: \[b c\]', 'mg_get_var 7', 0);
+    "my_var=b+c", 'Value: \[b c\]', 'mg_get_var 9', 0);
 
   # Test that big POSTed vars are not truncated
   my $my_var = 'x' x 64000;
   o("POST /test_get_var HTTP/1.0\nContent-Length: 64007\n\n".
-    "my_var=$my_var", 'Value size: \[64000\]', 'mg_get_var 8', 0);
-
-  # Test PUT
-  o("PUT /put HTTP/1.0\nContent-Length: 3\n\nabc",
-    '\nabc$', 'put callback', 0);
+    "my_var=$my_var", 'Value size: \[64000\]', 'mg_get_var 10', 0);
 
   o("POST /test_get_request_info?xx=yy HTTP/1.0\nFoo: bar\n".
     "Content-Length: 3\n\na=b",
     'Method: \[POST\].URI: \[/test_get_request_info\].'.
     'HTTP version: \[1.0\].HTTP header \[Foo\]: \[bar\].'.
     'HTTP header \[Content-Length\]: \[3\].'.
-    'Query string: \[xx=yy\].POST data: \[a=b\].'.
+    'Query string: \[xx=yy\].'.
     'Remote IP: \[\d+\].Remote port: \[\d+\].'.
     'Remote user: \[\]'
     , 'request_info', 0);
   o("GET /not_exist HTTP/1.0\n\n", 'Error: \[404\]', '404 handler', 0);
   o("bad request\n\n", 'Error: \[400\]', '* error handler', 0);
-  o("GET /test_user_data HTTP/1.0\n\n",
-    'User data: \[1234\]', 'user data in callback', 0);
 #	o("GET /foo/secret HTTP/1.0\n\n",
 #		'401 Unauthorized', 'mg_protect_uri', 0);
 #	o("GET /foo/secret HTTP/1.0\nAuthorization: Digest username=bill\n\n",
@@ -446,12 +437,6 @@ sub do_embedded_test {
 #	o("GET /foo/secret HTTP/1.0\nAuthorization: Digest username=joe\n\n",
 #		'200 OK', 'mg_protect_uri (joe)', 0);
 
-  # Test un-binding the URI
-  o("GET /foo/bar HTTP/1.0\n\n", 'HTTP/1.1 200 OK', '/foo bound', 0);
-  o("GET /test_remove_callback HTTP/1.0\n\n",
-    'Removing callbacks', 'Callback removal', 0);
-  o("GET /foo/bar HTTP/1.0\n\n", 'HTTP/1.1 404', '/foo unbound', 0);
-
   kill_spawned_child();
 }