1 --- php-4.3.0/ext/standard/mail.c.orig Fri Nov 29 12:15:43 2002
2 +++ php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003
10 #include "ext/standard/info.h"
13 #include "safe_mode.h"
16 +#include "zend_operators.h"
17 +#include "zend_globals.h"
21 #include "win32/sendmail.h"
26 - fprintf(sendmail, "To: %s\n", to);
27 - fprintf(sendmail, "Subject: %s\n", subject);
30 + if ((to != NULL) && (strlen(to)!=0)) {
31 + fprintf(sendmail, "To: %s\n", to);
33 + if ((subject != NULL) && (strlen(subject)!=0)) {
34 + fprintf(sendmail, "Subject: %s\n", subject);
37 + if (PG(http_globals)[TRACK_VARS_SERVER]) {
38 + zval **remote_addr, **server_name, **server_port,
39 + **script_name, **http_user_agent;
41 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) {
42 + convert_to_string_ex(remote_addr);
43 + fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr));
45 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) {
46 + convert_to_string_ex(server_name);
47 + fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name));
48 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) {
49 + convert_to_string_ex(server_port);
50 + fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port));
52 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &script_name)==SUCCESS) {
53 + convert_to_string_ex(script_name);
54 + fprintf(sendmail, "%s", Z_STRVAL_PP(script_name));
56 + fprintf(sendmail, "\n");
58 + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) {
59 + convert_to_string_ex(http_user_agent);
60 + fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent));
64 if (headers != NULL) {
65 fprintf(sendmail, "%s\n", headers);