diff options
| -rw-r--r-- | ext/dba/php_db4.h | 12 | ||||
| -rw-r--r-- | ext/imap/php_imap.c | 25 | ||||
| -rw-r--r-- | sapi/cgi/libfcgi/include/fcgi_config_win32.h | 111 |
3 files changed, 19 insertions, 129 deletions
diff --git a/ext/dba/php_db4.h b/ext/dba/php_db4.h deleted file mode 100644 index fa814c3f5e..0000000000 --- a/ext/dba/php_db4.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef PHP_DB4_H -#define PHP_DB4_H - -#if DBA_DB4 - -#include "php_dba.h" - -DBA_FUNCS(db4); - -#endif - -#endif diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index f40a2eb85a..4a475d85e7 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -20,7 +20,7 @@ | Rasmus Lerdorf <rasmus@php.net> | | Chuck Hagenbuch <chuck@horde.org> | | Andrew Skalski <askalski@chekinc.com> | - | Hartmut Holzgraefe <hartmut@six.de> | + | Hartmut Holzgraefe <hholzgra@php.net> | | Jani Taskinen <sniper@iki.fi> | | Daniel R. Kalowsky <kalowsky@php.net> | | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | @@ -3162,7 +3162,9 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char * addr = addr->next; } efree(tempMailTo); - bufferTo[offset] = 0; + if (offset>0) { + bufferTo[offset-1] = 0; + } } if (cc && *cc) { @@ -3180,7 +3182,9 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char * addr = addr->next; } efree(tempMailTo); - bufferCc[offset] = 0; + if (offset>0) { + bufferCc[offset-1] = 0; + } } if (bcc && *bcc) { @@ -3198,7 +3202,9 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char * addr = addr->next; } efree(tempMailTo); - bufferBcc[offset] = 0; + if (offset>0) { + bufferBcc[offset-1] = 0; + } } @@ -3211,8 +3217,15 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char * } return 0; } - if (bufferCc) efree(bufferCc); - if (bufferBcc) efree(bufferBcc); + if (bufferTo) { + efree(bufferTo); + } + if (bufferCc) { + efree(bufferCc); + } + if (bufferBcc) { + efree(bufferBcc); + } #else if (!INI_STR("sendmail_path")) { return 0; diff --git a/sapi/cgi/libfcgi/include/fcgi_config_win32.h b/sapi/cgi/libfcgi/include/fcgi_config_win32.h deleted file mode 100644 index 81ff264d9f..0000000000 --- a/sapi/cgi/libfcgi/include/fcgi_config_win32.h +++ /dev/null @@ -1,111 +0,0 @@ -/* fcgi_config.h. Generated automatically by configure. */ -/* fcgi_config.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define if you have the <arpa/inet.h> header file. */ -#define HAVE_ARPA_INET_H 1 - -/* Define if you have the <dlfcn.h> header file. */ -#define HAVE_DLFCN_H 1 - -/* Define if there's a fileno() prototype in stdio.h */ -#define HAVE_FILENO_PROTO 1 - -/* Define if the fpos_t typedef is in stdio.h */ -#define HAVE_FPOS 1 - -/* Define if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define if you have the `dnet_stub' library (-ldnet_stub). */ -/* #undef HAVE_LIBDNET_STUB */ - -/* Define if you have the `ieee' library (-lieee). */ -/* #undef HAVE_LIBIEEE */ - -/* Define if you have the `nsl' library (-lnsl). */ -#define HAVE_LIBNSL 1 - -/* Define if you have the pthread library */ -#define HAVE_LIBPTHREAD 1 - -/* Define if you have the `resolv' library (-lresolv). */ -#define HAVE_LIBRESOLV 1 - -/* Define if you have the `socket' library (-lsocket). */ -#define HAVE_LIBSOCKET 1 - -/* Define if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - -/* Define if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if you have the <netdb.h> header file. */ -/* #define HAVE_NETDB_H 1 */ - -/* Define if you have the <netinet/in.h> header file. */ -#define HAVE_NETINET_IN_H 1 - -/* Define if sockaddr_un in sys/un.h contains a sun_len component */ -/* #undef HAVE_SOCKADDR_UN_SUN_LEN */ - -/* Define if the socklen_t typedef is in sys/socket.h */ -/* #undef HAVE_SOCKLEN */ - -/* Define if you have the <stdint.h> header file. */ -/* #undef HAVE_STDINT_H */ - -/* Define if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define if you have the <sys/param.h> header file. */ -/* #define HAVE_SYS_PARAM_H 1 */ - -/* Define if you have the <sys/socket.h> header file. */ -/*#define HAVE_SYS_SOCKET_H 1*/ - -/* Define if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define if you have the <sys/time.h> header file. */ -/*#define HAVE_SYS_TIME_H 1*/ - -/* Define if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the <unistd.h> header file. */ -/*#define HAVE_UNISTD_H 1*/ - -/* Define if va_arg(arg, long double) crashes the compiler */ -/* #undef HAVE_VA_ARG_LONG_DOUBLE_BUG */ - -/* Name of package */ -#define PACKAGE "fcgi" - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if cross-process locking is required by accept() */ -#define USE_LOCKING 1 - -/* Version number of package */ -#define VERSION "2.2.2" - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ - -/* Define to `int' if <sys/types.h> does not define. */ -#define ssize_t int
\ No newline at end of file |