- use SCRIPT_NAME instead of REQUEST_URI (won't leak passwords and such things in...

Changed files:
    php-mail.patch -> 1.9

diff --git a/php-mail.patch b/php-mail.patch
index 1db4c2b28d287a5b47c0ac7554212dd2b7b0d786..4ba0422823106ae7d7b2840a3ac698eec2a7ff61 100644 (file)
--- a/php-mail.patch
+++ b/php-mail.patch
@@ -36,7 +36,7 @@
 +
 +              if (PG(http_globals)[TRACK_VARS_SERVER]) {
 +                      zval **remote_addr, **server_name, **server_port,
-+                              **request_uri, **http_user_agent;
++                              **script_name, **http_user_agent;
 +                      
 +                      if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) {
 +                              convert_to_string_ex(remote_addr);
@@ -49,9 +49,9 @@
 +                                      convert_to_string_ex(server_port);
 +                                      fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port));
 +                              }       
-+                              if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REQUEST_URI", sizeof("REQUEST_URI"), (void **) &request_uri)==SUCCESS) {
-+                                      convert_to_string_ex(request_uri);
-+                                      fprintf(sendmail, "%s", Z_STRVAL_PP(request_uri));
++                              if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &scrip_name)==SUCCESS) {
++                                      convert_to_string_ex(script_name);
++                                      fprintf(sendmail, "%s", Z_STRVAL_PP(script_name));
 +                              }
 +                              fprintf(sendmail, "\n");
 +                      }