Commit a358ac96 authored by Brian Havard's avatar Brian Havard
Browse files

Bring forward my recent 1.3 patches. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84802 13f79535-47bb-0310-9956-ffa450edef68
parent 9dd20f43

include/ap_config.h

+1 −0
Changes for include/ap_config.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -824,6 +824,7 @@ typedef int rlim_t; 
#define NO_RELIABLE_PIPED_LOGS

#define USE_OS2SEM_SERIALIZED_ACCEPT

#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT

#define NO_SLACK



#elif defined(__MACHTEN__)

typedef int rlim_t;

server/util_script.c

+16 −1
Changes for server/util_script.c: 16 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ API_EXPORT(void) ap_add_common_vars(request_rec *r) 
    conn_rec *c = r->connection;

    const char *rem_logname;

    char *env_path;

#ifdef WIN32

#if defined(WIN32) || defined(OS2)

    char *env_temp;

#endif

    const char *host;
@@ -269,6 +269,21 @@ API_EXPORT(void) ap_add_common_vars(request_rec *r) 
    }

#endif



#ifdef OS2

    if ((env_temp = getenv("COMSPEC")) != NULL) {

        ap_table_addn(e, "COMSPEC", env_temp);            

    }

    if ((env_temp = getenv("ETC")) != NULL) {

        ap_table_addn(e, "ETC", env_temp);            

    }

    if ((env_temp = getenv("DPATH")) != NULL) {

        ap_table_addn(e, "DPATH", env_temp);            

    }

    if ((env_temp = getenv("PERLLIB_PREFIX")) != NULL) {

        ap_table_addn(e, "PERLLIB_PREFIX", env_temp);            

    }

#endif



    ap_table_addn(e, "PATH", env_path);

    ap_table_addn(e, "SERVER_SIGNATURE", ap_psignature("", r));

    ap_table_addn(e, "SERVER_SOFTWARE", ap_get_server_version());