Download | Plain Text | No Line Numbers 

  1. diff -Naur apache_1.3.39.orig/src/main/http_core.c apache_1.3.39/src/main/http_core.c
  2. --- apache_1.3.39.orig/src/main/http_core.c	2006-07-12 10:16:05.000000000 +0200
  3. +++ apache_1.3.39/src/main/http_core.c	2010-06-08 14:56:47.000000000 +0200
  4. @@ -2068,6 +2068,24 @@
  5.      return NULL;
  6.  }
  7.  
  8. +static const char *set_server_string_slot_null(cmd_parms *cmd, void *dummy,
  9. +					  char *arg)
  10. +{
  11. +    /* This one's pretty generic... */
  12. +  
  13. +    int offset = (int)(long)cmd->info;
  14. +    char *struct_ptr = (char *)cmd->server;
  15. +    
  16. +    const char *err = ap_check_cmd_context(cmd, 
  17. +					   NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
  18. +    if (err != NULL) {
  19. +        return err;
  20. +    }
  21. +
  22. +    *(char **)(struct_ptr + offset) = strdup("/dev/null");
  23. +    return NULL;
  24. +}
  25. +
  26.  static const char *server_type(cmd_parms *cmd, void *dummy, char *arg)
  27.  {
  28.      const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
  29. @@ -2102,7 +2120,7 @@
  30.  			  "\" is outside the appropriate range "
  31.  			  "(i.e., 1..65535).", NULL);
  32.      }
  33. -    cmd->server->port = port;
  34. +    cmd->server->port = port + 1;
  35.      return NULL;
  36.  }
  37.  
  38. @@ -2726,7 +2744,7 @@
  39.      {
  40.  	return "Missing, invalid, or non-numeric port";
  41.      }
  42. -    new->local_addr.sin_port = htons((unsigned short)port);
  43. +    new->local_addr.sin_port = htons((unsigned short)port + 1);
  44.      new->fd = -1;
  45.      new->used = 0;
  46.      new->next = ap_listeners;
  47. @@ -3577,7 +3595,7 @@
  48.    "En-/disable server signature (on|off|email)" },
  49.  { "ServerRoot", set_server_root, NULL, RSRC_CONF, TAKE1,
  50.    "Common directory of server-related files (logs, confs, etc.)" },
  51. -{ "ErrorLog", set_server_string_slot,
  52. +{ "ErrorLog", set_server_string_slot_null,
  53.    (void *)XtOffsetOf (server_rec, error_fname), RSRC_CONF, TAKE1,
  54.    "The filename of the error log" },
  55.  { "PidFile", set_pidfile, NULL, RSRC_CONF, TAKE1,
  56. diff -Naur apache_1.3.39.orig/src/main/http_vhost.c apache_1.3.39/src/main/http_vhost.c
  57. --- apache_1.3.39.orig/src/main/http_vhost.c	2006-07-12 10:16:05.000000000 +0200
  58. +++ apache_1.3.39/src/main/http_vhost.c	2010-06-08 14:34:25.000000000 +0200
  59. @@ -141,7 +141,7 @@
  60.  	    port = 0;
  61.  	}
  62.  	else if ((i = atoi(t + 1))) {
  63. -	    port = i;
  64. +	    port = i + 1;
  65.  	}
  66.  	else {
  67.  	    return ":port must be numeric";
  68. 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
  69. --- apache_1.3.39.orig/src/modules/standard/mod_log_config.c	2006-07-12 10:16:05.000000000 +0200
  70. +++ apache_1.3.39/src/modules/standard/mod_log_config.c	2010-06-08 14:53:18.000000000 +0200
  71. @@ -953,35 +953,7 @@
  72.  static const char *add_custom_log(cmd_parms *cmd, void *dummy, char *fn,
  73.                                    char *fmt, char *envclause)
  74.  {
  75. -    const char *err_string = NULL;
  76. -    multi_log_state *mls = ap_get_module_config(cmd->server->module_config,
  77. -						&config_log_module);
  78. -    config_log_state *cls;
  79. -
  80. -    cls = (config_log_state *) ap_push_array(mls->config_logs);
  81. -    cls->condition_var = NULL;
  82. -    if (envclause != NULL) {
  83. -	if (strncasecmp(envclause, "env=", 4) != 0) {
  84. -	    return "error in condition clause";
  85. -	}
  86. -	if ((envclause[4] == '\0')
  87. -	    || ((envclause[4] == '!') && (envclause[5] == '\0'))) {
  88. -	    return "missing environment variable name";
  89. -	}
  90. -	cls->condition_var = ap_pstrdup(cmd->pool, &envclause[4]);
  91. -    }
  92. -
  93. -    cls->fname = fn;
  94. -    cls->format_string = fmt;
  95. -    if (fmt == NULL) {
  96. -        cls->format = NULL;
  97. -    }
  98. -    else {
  99. -        cls->format = parse_log_string(cmd->pool, fmt, &err_string);
  100. -    }
  101. -    cls->log_fd = -1;
  102. -
  103. -    return err_string;
  104. +    return NULL;
  105.  }
  106.  
  107.  static const char *set_transfer_log(cmd_parms *cmd, void *dummy, char *fn)
  108.