diff -Naur apache_1.3.39.orig/src/main/http_core.c apache_1.3.39/src/main/http_core.c --- apache_1.3.39.orig/src/main/http_core.c 2006-07-12 10:16:05.000000000 +0200 +++ apache_1.3.39/src/main/http_core.c 2010-06-08 14:56:47.000000000 +0200 @@ -2068,6 +2068,24 @@ return NULL; } +static const char *set_server_string_slot_null(cmd_parms *cmd, void *dummy, + char *arg) +{ + /* This one's pretty generic... */ + + int offset = (int)(long)cmd->info; + char *struct_ptr = (char *)cmd->server; + + const char *err = ap_check_cmd_context(cmd, + NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT); + if (err != NULL) { + return err; + } + + *(char **)(struct_ptr + offset) = strdup("/dev/null"); + return NULL; +} + static const char *server_type(cmd_parms *cmd, void *dummy, char *arg) { const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); @@ -2102,7 +2120,7 @@ "\" is outside the appropriate range " "(i.e., 1..65535).", NULL); } - cmd->server->port = port; + cmd->server->port = port + 1; return NULL; } @@ -2726,7 +2744,7 @@ { return "Missing, invalid, or non-numeric port"; } - new->local_addr.sin_port = htons((unsigned short)port); + new->local_addr.sin_port = htons((unsigned short)port + 1); new->fd = -1; new->used = 0; new->next = ap_listeners; @@ -3577,7 +3595,7 @@ "En-/disable server signature (on|off|email)" }, { "ServerRoot", set_server_root, NULL, RSRC_CONF, TAKE1, "Common directory of server-related files (logs, confs, etc.)" }, -{ "ErrorLog", set_server_string_slot, +{ "ErrorLog", set_server_string_slot_null, (void *)XtOffsetOf (server_rec, error_fname), RSRC_CONF, TAKE1, "The filename of the error log" }, { "PidFile", set_pidfile, NULL, RSRC_CONF, TAKE1, diff -Naur apache_1.3.39.orig/src/main/http_vhost.c apache_1.3.39/src/main/http_vhost.c --- apache_1.3.39.orig/src/main/http_vhost.c 2006-07-12 10:16:05.000000000 +0200 +++ apache_1.3.39/src/main/http_vhost.c 2010-06-08 14:34:25.000000000 +0200 @@ -141,7 +141,7 @@ port = 0; } else if ((i = atoi(t + 1))) { - port = i; + port = i + 1; } else { return ":port must be numeric"; diff -Naur apache_1.3.39.orig/src/modules/standard/mod_log_config.c apache_1.3.39/src/modules/standard/mod_log_config.c --- apache_1.3.39.orig/src/modules/standard/mod_log_config.c 2006-07-12 10:16:05.000000000 +0200 +++ apache_1.3.39/src/modules/standard/mod_log_config.c 2010-06-08 14:53:18.000000000 +0200 @@ -953,35 +953,7 @@ static const char *add_custom_log(cmd_parms *cmd, void *dummy, char *fn, char *fmt, char *envclause) { - const char *err_string = NULL; - multi_log_state *mls = ap_get_module_config(cmd->server->module_config, - &config_log_module); - config_log_state *cls; - - cls = (config_log_state *) ap_push_array(mls->config_logs); - cls->condition_var = NULL; - if (envclause != NULL) { - if (strncasecmp(envclause, "env=", 4) != 0) { - return "error in condition clause"; - } - if ((envclause[4] == '\0') - || ((envclause[4] == '!') && (envclause[5] == '\0'))) { - return "missing environment variable name"; - } - cls->condition_var = ap_pstrdup(cmd->pool, &envclause[4]); - } - - cls->fname = fn; - cls->format_string = fmt; - if (fmt == NULL) { - cls->format = NULL; - } - else { - cls->format = parse_log_string(cmd->pool, fmt, &err_string); - } - cls->log_fd = -1; - - return err_string; + return NULL; } static const char *set_transfer_log(cmd_parms *cmd, void *dummy, char *fn)