From 3b6c6af3faa6a66e4f5337a769baed32f404b82b Mon Sep 17 00:00:00 2001
From: Stefan Esser
Date: Sat, 14 Jan 2012 19:32:14 +0100
Subject: Use new suhosin_getenv() function in all places Add protection
 against mbstring Add detection of incompatible extensions that change POST
 handlers

---
 log.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'log.c')

diff --git a/log.c b/log.c
index cc297d2..2e3d7a1 100644
--- a/log.c
+++ b/log.c
@@ -118,12 +118,12 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
 	}
 	
 	if (SUHOSIN_G(log_use_x_forwarded_for)) {
-		ip_address = sapi_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
+		ip_address = suhosin_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
 		if (ip_address == NULL) {
 			ip_address = "X-FORWARDED-FOR not set";
 		}
 	} else {
-		ip_address = sapi_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
+		ip_address = suhosin_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
 		if (ip_address == NULL) {
 			ip_address = "REMOTE_ADDR not set";
 		}
@@ -154,7 +154,7 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
 		}
 		ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno);
 	} else {
-		fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
+		fname = suhosin_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
 		if (fname==NULL) {
 			fname = "unknown";
 		}
-- 
cgit v1.3