1 --- php-5.2.0/ext/standard/mail.c 2006-12-01 14:20:27.881416250 +0100
2 +++ php-5.2.4/ext/standard/mail.c 2007-08-31 19:25:50.777713042 +0300
10 #include "ext/standard/info.h"
14 #include "safe_mode.h"
16 +#include "zend_operators.h"
17 +#include "zend_globals.h"
20 #include "win32/sendmail.h"
25 + /* search for To: and Subject: headers which should be specified in proper mail() parameters, not in additional headers */
26 + if (headers != NULL) {
27 + if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 || strcasestr(headers, "\nto:")) {
28 + php_error_docref(NULL TSRMLS_CC, E_WARNING, "To: headers aren't allowed in the additional_headers parameter. Use $to parameter for that. Mail not sent.");
31 + if (strncasecmp(headers, "subject:", sizeof("subject:") - 1) == 0 || strcasestr(headers, "\nsubject:")) {
32 + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Subject: headers aren't allowed in the additional_headers parameter. Use $subject parameter for that. Mail not sent.");
38 to_r = estrndup(to, to_len);
39 for (; to_len; to_len--) {
44 - fprintf(sendmail, "To: %s\n", to);
45 - fprintf(sendmail, "Subject: %s\n", subject);
48 + if ((to != NULL) && (strlen(to)!=0)) {
49 + fprintf(sendmail, "To: %s\n", to);
51 + if ((subject != NULL) && (strlen(subject)!=0)) {
52 + fprintf(sendmail, "Subject: %s\n", subject);
55 + if (PG(http_globals)[TRACK_VARS_SERVER]) {
56 + zval **remote_addr, **server_name, **server_port,
57 + **script_name, **http_user_agent;
59 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) {
60 + convert_to_string_ex(remote_addr);
61 + fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr));
63 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) {
64 + convert_to_string_ex(server_name);
65 + fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name));
66 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) {
67 + convert_to_string_ex(server_port);
68 + fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port));
70 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &script_name)==SUCCESS) {
71 + convert_to_string_ex(script_name);
72 + fprintf(sendmail, "%s", Z_STRVAL_PP(script_name));
74 + fprintf(sendmail, "\n");
76 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) {
77 + convert_to_string_ex(http_user_agent);
78 + fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent));
83 fprintf(sendmail, "%s\n", hdr);