1 diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c
2 --- php-5.2.0.org/ext/standard/mail.c 2006-01-01 13:50:15.000000000 +0100
3 +++ php-5.2.0/ext/standard/mail.c 2006-12-01 14:20:27.881416250 +0100
11 #include "ext/standard/info.h"
14 #include "safe_mode.h"
17 +#include "zend_operators.h"
18 +#include "zend_globals.h"
22 #include "win32/sendmail.h"
27 + /* search for To: and Subject: headers which should be specified in proper mail() parameters, not in additional headers */
28 + if (headers != NULL) {
29 + if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 || strcasestr(headers, "\nto:")) {
30 + 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.");
33 + if (strncasecmp(headers, "subject:", sizeof("subject:") - 1) == 0 || strcasestr(headers, "\nsubject:")) {
34 + 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.");
40 to_r = estrndup(to, to_len);
41 for (; to_len; to_len--) {
46 - fprintf(sendmail, "To: %s\n", to);
47 - fprintf(sendmail, "Subject: %s\n", subject);
50 + if ((to != NULL) && (strlen(to)!=0)) {
51 + fprintf(sendmail, "To: %s\n", to);
53 + if ((subject != NULL) && (strlen(subject)!=0)) {
54 + fprintf(sendmail, "Subject: %s\n", subject);
57 + if (PG(http_globals)[TRACK_VARS_SERVER]) {
58 + zval **remote_addr, **server_name, **server_port,
59 + **script_name, **http_user_agent;
61 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) {
62 + convert_to_string_ex(remote_addr);
63 + fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr));
65 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) {
66 + convert_to_string_ex(server_name);
67 + fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name));
68 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) {
69 + convert_to_string_ex(server_port);
70 + fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port));
72 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &script_name)==SUCCESS) {
73 + convert_to_string_ex(script_name);
74 + fprintf(sendmail, "%s", Z_STRVAL_PP(script_name));
76 + fprintf(sendmail, "\n");
78 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) {
79 + convert_to_string_ex(http_user_agent);
80 + fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent));
84 if (headers != NULL) {
85 fprintf(sendmail, "%s\n", headers);