summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-05-13 19:58:58 +0200
committerBenny Baumann <BenBE@geshi.org>2013-05-13 19:58:58 +0200
commitdb0e084bdced689e15246b97fdea7bd85e299bef (patch)
tree76d521501f06ec9df311a9fb79da622d41821253
parentc7e62bb54f7ee4214d5f50cf92192b53dfb993d0 (diff)
parent473373dc3708a0f14a0eb569a9f2b07c3e14aaec (diff)
downloadcacert-devel-db0e084bdced689e15246b97fdea7bd85e299bef.tar.gz
cacert-devel-db0e084bdced689e15246b97fdea7bd85e299bef.tar.xz
cacert-devel-db0e084bdced689e15246b97fdea7bd85e299bef.zip
Merge branch 'bug-1171' into release
-rw-r--r--includes/mysql.php.sample3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample
index eb86401..10185fc 100644
--- a/includes/mysql.php.sample
+++ b/includes/mysql.php.sample
@@ -64,7 +64,8 @@
fputs($smtp, "DATA\r\n");
$InputBuffer = fgets($smtp, 1024);
fputs($smtp, "X-Mailer: CAcert.org Website\r\n");
- fputs($smtp, "X-OriginatingIP: ".$_SERVER["REMOTE_ADDR"]."\r\n");
+ if (array_key_exists("REMOTE_ADDR", $_SERVER))
+ fputs($smtp, "X-OriginatingIP: ".$_SERVER["REMOTE_ADDR"]."\r\n");
fputs($smtp, "Sender: $errorsto\r\n");
fputs($smtp, "Errors-To: $errorsto\r\n");
if($replyto != "")