httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1000326 - /httpd/sandbox/replacelimit/server/util_script.c
Date Thu, 23 Sep 2010 05:38:02 GMT
Author: wrowe
Date: Thu Sep 23 05:38:02 2010
New Revision: 1000326

URL: http://svn.apache.org/viewvc?rev=1000326&view=rev
Log:
Revert one miscommitted file that isn't related to the <Limit> change,
thanks to ruediger for the pointer.

Modified:
    httpd/sandbox/replacelimit/server/util_script.c

Modified: httpd/sandbox/replacelimit/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/replacelimit/server/util_script.c?rev=1000326&r1=1000325&r2=1000326&view=diff
==============================================================================
--- httpd/sandbox/replacelimit/server/util_script.c (original)
+++ httpd/sandbox/replacelimit/server/util_script.c Thu Sep 23 05:38:02 2010
@@ -124,7 +124,9 @@ AP_DECLARE(void) ap_add_common_vars(requ
     conn_rec *c = r->connection;
     const char *rem_logname;
     const char *env_path;
+#if defined(WIN32) || defined(OS2)
     const char *env_temp;
+#endif
     const char *host;
     const apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in);
     const apr_table_entry_t *hdrs = (const apr_table_entry_t *) hdrs_arr->elts;
@@ -189,7 +191,7 @@ AP_DECLARE(void) ap_add_common_vars(requ
     }
     apr_table_addn(e, "PATH", apr_pstrdup(r->pool, env_path));
 
-#if defined(WIN32)
+#ifdef WIN32
     if (env_temp = getenv("SystemRoot")) {
         apr_table_addn(e, "SystemRoot", env_temp);
     }
@@ -202,43 +204,6 @@ AP_DECLARE(void) ap_add_common_vars(requ
     if (env_temp = getenv("WINDIR")) {
         apr_table_addn(e, "WINDIR", env_temp);
     }
-#elif defined(OS2)
-    if ((env_temp = getenv("COMSPEC")) != NULL) {
-        apr_table_addn(e, "COMSPEC", env_temp);
-    }
-    if ((env_temp = getenv("ETC")) != NULL) {
-        apr_table_addn(e, "ETC", env_temp);
-    }
-    if ((env_temp = getenv("DPATH")) != NULL) {
-        apr_table_addn(e, "DPATH", env_temp);
-    }
-    if ((env_temp = getenv("PERLLIB_PREFIX")) != NULL) {
-        apr_table_addn(e, "PERLLIB_PREFIX", env_temp);
-    }
-#elif defined(BEOS)
-    if ((env_temp = getenv("LIBRARY_PATH")) != NULL) {
-        apr_table_addn(e, "LIBRARY_PATH", env_temp);
-    }
-#elif defined(DARWIN)
-    if ((env_temp = getenv("DYLD_LIBRARY_PATH")) != NULL) {
-        apr_table_addn(e, "DYLD_LIBRARY_PATH", env_temp);
-    }
-#elif defined(_AIX)
-    if ((env_temp = getenv("LIBPATH")) != NULL) {
-        apr_table_addn(e, "LIBPATH", env_temp);
-    }
-#elif defined(__HPUX__)
-    /* HPUX PARISC 2.0W knows both, otherwise redundancy is harmless */
-    if ((env_temp = getenv("SHLIB_PATH")) != NULL) {
-        apr_table_addn(e, "SHLIB_PATH", env_temp);
-    }
-    if ((env_temp = getenv("LD_LIBRARY_PATH")) != NULL) {
-        apr_table_addn(e, "LD_LIBRARY_PATH", env_temp);
-    }
-#else /* Some Unix */
-    if ((env_temp = getenv("LD_LIBRARY_PATH")) != NULL) {
-        apr_table_addn(e, "LD_LIBRARY_PATH", env_temp);
-    }
 #endif
 
 #ifdef OS2



Mime
View raw message