svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c

pajoye Wed, 19 Aug 2009 18:43:46 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287480 Log: - fixed #43327, wrong return value from mail(), if sendmail_path is wrong Bug: http://bugs.php.net/43327 (Closed) wrong return value from mail(), if sendmail_path is wrong Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c U php/php-src/trunk/TSRM/tsrm_win32.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-08-19 18:18:45 UTC (rev 287479) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-19 18:43:46 UTC (rev 287480) @@ -142,6 +142,7 @@ - Fixed bug #45554 (Inconsistent behavior of the u format char). (Derick) - Fixed bug #43510 (stream_get_meta_data() does not return same mode as used in fopen). (Jani) +- Fixed #43327, wrong return value from mail(), if sendmail_path is wrong. (Garrett) - Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot com, Kalle) - Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c =================================================================== --- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-08-19 18:18:45 UTC (rev 287479) +++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2009-08-19 18:43:46 UTC (rev 287480) @@ -311,7 +311,6 @@ SECURITY_ATTRIBUTES security; HANDLE in, out; DWORD dwCreateFlags = 0; - char *cmd; process_pair *proc; TSRMLS_FETCH(); @@ -348,12 +347,9 @@ dwCreateFlags |= CREATE_NO_WINDOW; } - cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2); - sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command); - if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) { + if (!CreateProcess(NULL, command, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) { return NULL; } - free(cmd); CloseHandle(process.hThread); proc = process_get(NULL TSRMLS_CC); Modified: php/php-src/trunk/TSRM/tsrm_win32.c =================================================================== --- php/php-src/trunk/TSRM/tsrm_win32.c 2009-08-19 18:18:45 UTC (rev 287479) +++ php/php-src/trunk/TSRM/tsrm_win32.c 2009-08-19 18:43:46 UTC (rev 287480) @@ -312,7 +312,6 @@ SECURITY_ATTRIBUTES security; HANDLE in, out; DWORD dwCreateFlags = 0; - char *cmd; process_pair *proc; TSRMLS_FETCH(); @@ -350,12 +349,9 @@ dwCreateFlags |= CREATE_NO_WINDOW; } - cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2); - sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command); - if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) { + if (!CreateProcess(NULL, command, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process)) { return NULL; } - free(cmd); CloseHandle(process.hThread); proc = process_get(NULL TSRMLS_CC);