svn: /php/php-src/ branches/PHP_5_2/win32/sendmail.c branches/PHP_5_2/win32/sendmail.h branches/PHP_5_3/win32/sendmail.c
branches/PHP_5_3/win32/sendmail.h trunk/win32/sendmail.c trunk/win32/sendmail.h
| From: | Pierre-Alain Joye | Date: | Wed, 26 Aug 2009 21:59:54 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/win32/sendmail.c branches/PHP_5_2/win32/sendmail.h branches/PHP_5_3/win32/sendmail.c branches/PHP_5_3/win32/sendmail.h trunk/win32/sendmail.c trunk/win32/sendmail.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60244@lists.php.net to get a copy of this message | ||
pajoye Wed, 26 Aug 2009 21:59:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287783
Log:
- silent warning (fix for #28038)
Bug: http://bugs.php.net/28038 (Closed) Sent incorrect RCPT
TO commands to SMTP server
Changed paths:
U php/php-src/branches/PHP_5_2/win32/sendmail.c
U php/php-src/branches/PHP_5_2/win32/sendmail.h
U php/php-src/branches/PHP_5_3/win32/sendmail.c
U php/php-src/branches/PHP_5_3/win32/sendmail.h
U php/php-src/trunk/win32/sendmail.c
U php/php-src/trunk/win32/sendmail.h
Modified: php/php-src/branches/PHP_5_2/win32/sendmail.c
===================================================================
--- php/php-src/branches/PHP_5_2/win32/sendmail.c 2009-08-26 20:58:06 UTC (rev 287782)
+++ php/php-src/branches/PHP_5_2/win32/sendmail.c 2009-08-26 21:59:54 UTC (rev 287783)
@@ -937,7 +937,7 @@
// Author/Date: garretts 08/18/2009
// History:
//********************************************************************/
-int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString ) {
+static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString) {
char *tmpAddress1, *tmpAddress2;
int result;
Modified: php/php-src/branches/PHP_5_2/win32/sendmail.h
===================================================================
--- php/php-src/branches/PHP_5_2/win32/sendmail.h 2009-08-26 20:58:06 UTC (rev 287782)
+++ php/php-src/branches/PHP_5_2/win32/sendmail.h 2009-08-26 21:59:54 UTC (rev 287783)
@@ -47,4 +47,5 @@
static int Post(LPCSTR msg);
static int Ack(char **server_response);
static unsigned long GetAddr(LPSTR szHost);
+static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString);
#endif /* sendmail_h */
Modified: php/php-src/branches/PHP_5_3/win32/sendmail.c
===================================================================
--- php/php-src/branches/PHP_5_3/win32/sendmail.c 2009-08-26 20:58:06 UTC (rev 287782)
+++ php/php-src/branches/PHP_5_3/win32/sendmail.c 2009-08-26 21:59:54 UTC (rev 287783)
@@ -975,7 +975,7 @@
// Author/Date: garretts 08/18/2009
// History:
//********************************************************************/
-int FormatEmailAddress(char* Buf, char* EmailAddress, char* FormatString ) {
+static int FormatEmailAddress(char* Buf, char* EmailAddress, char* FormatString) {
char *tmpAddress1, *tmpAddress2;
int result;
Modified: php/php-src/branches/PHP_5_3/win32/sendmail.h
===================================================================
--- php/php-src/branches/PHP_5_3/win32/sendmail.h 2009-08-26 20:58:06 UTC (rev 287782)
+++ php/php-src/branches/PHP_5_3/win32/sendmail.h 2009-08-26 21:59:54 UTC (rev 287783)
@@ -47,4 +47,5 @@
static int Post(LPCSTR msg);
static int Ack(char **server_response);
static unsigned long GetAddr(LPSTR szHost);
+static int FormatEmailAddress(char* Buf, char* EmailAddress, char* FormatString);
#endif /* sendmail_h */
Modified: php/php-src/trunk/win32/sendmail.c
===================================================================
--- php/php-src/trunk/win32/sendmail.c 2009-08-26 20:58:06 UTC (rev 287782)
+++ php/php-src/trunk/win32/sendmail.c 2009-08-26 21:59:54 UTC (rev 287783)
@@ -975,7 +975,7 @@
// Author/Date: garretts 08/18/2009
// History:
//********************************************************************/
-int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString ) {
+static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString ) {
char *tmpAddress1, *tmpAddress2;
int result;
Modified: php/php-src/trunk/win32/sendmail.h
===================================================================
--- php/php-src/trunk/win32/sendmail.h 2009-08-26 20:58:06 UTC (rev 287782)
+++ php/php-src/trunk/win32/sendmail.h 2009-08-26 21:59:54 UTC (rev 287783)
@@ -47,4 +47,5 @@
static int Post(LPCSTR msg);
static int Ack(char **server_response);
static unsigned long GetAddr(LPSTR szHost);
+static int FormatEmailAddress(char* Buffer, char* EmailAddress, char* FormatString );
#endif /* sendmail_h */