]> TLD Linux GIT Repositories - packages/php.git/blobdiff - php-mail.patch
- remove unused patches
[packages/php.git] / php-mail.patch
diff --git a/php-mail.patch b/php-mail.patch
deleted file mode 100644 (file)
index e541727..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
---- php-5.2.0/ext/standard/mail.c      2006-12-01 14:20:27.881416250 +0100
-+++ php-5.2.4/ext/standard/mail.c      2007-08-31 19:25:50.777713042 +0300
-@@ -35,6 +37,8 @@
- #include "php_ini.h"
- #include "safe_mode.h"
- #include "exec.h"
-+#include "zend_operators.h"
-+#include "zend_globals.h"
- #ifdef PHP_WIN32
- #include "win32/sendmail.h"
-@@ -107,6 +111,18 @@
-               return;
-       }
-+    /* search for To: and Subject: headers which should be specified in proper mail() parameters, not in additional headers */
-+    if (headers != NULL) {
-+        if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 || strcasestr(headers, "\nto:")) {
-+            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.");
-+            RETURN_FALSE;
-+        }
-+        if (strncasecmp(headers, "subject:", sizeof("subject:") - 1) == 0 || strcasestr(headers, "\nsubject:")) {
-+            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.");
-+            RETURN_FALSE;
-+        }
-+    }
-+
-       if (to_len > 0) {
-               to_r = estrndup(to, to_len);
-               for (; to_len; to_len--) {
-@@ -231,8 +247,42 @@
-                       return 0;
-               }
- #endif
--              fprintf(sendmail, "To: %s\n", to);
--              fprintf(sendmail, "Subject: %s\n", subject);
-+              TSRMLS_FETCH();
-+
-+              if ((to != NULL) && (strlen(to)!=0)) {
-+                      fprintf(sendmail, "To: %s\n", to);
-+              }
-+              if ((subject != NULL) && (strlen(subject)!=0)) {
-+                      fprintf(sendmail, "Subject: %s\n", subject);
-+              }
-+              zend_is_auto_global(ZEND_STRL("_SERVER") TSRMLS_CC);
-+              if (PG(http_globals)[TRACK_VARS_SERVER]) {
-+                      zval **remote_addr, **server_name, **server_port,
-+                              **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);
-+                              fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr));
-+                      }
-+                      if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) {
-+                              convert_to_string_ex(server_name);
-+                              fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name));
-+                              if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) {
-+                                      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, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &script_name)==SUCCESS) {
-+                                      convert_to_string_ex(script_name);
-+                                      fprintf(sendmail, "%s", Z_STRVAL_PP(script_name));
-+                              }
-+                              fprintf(sendmail, "\n");
-+                      }
-+                      if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) {
-+                              convert_to_string_ex(http_user_agent);
-+                                      fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent));
-+                      }
-+              }
-+
-               if (hdr != NULL) {
-                       fprintf(sendmail, "%s\n", hdr);
-               }