[PHP-CVS] cvs: php-src /ext/iconv/tests bug16069.phpt
derick Sun Aug 7 08:48:31 2005 EDT
Modified files:
/php-src/ext/iconv/testsbug16069.phpt
Log:
- Fix skip-if comment.
http://cvs.php.net/diff.php/php-src/ext/iconv/tests/bug16069.phpt?r1=1.4r2=1.5ty=u
Index: php-src/ext/iconv/tests/bug16069.phpt
diff -u php-src/ext/iconv/tests/bug16069.phpt:1.4
php-src/ext/iconv/tests/bug16069.phpt:1.5
--- php-src/ext/iconv/tests/bug16069.phpt:1.4 Tue Oct 29 11:25:23 2002
+++ php-src/ext/iconv/tests/bug16069.phpt Sun Aug 7 08:48:31 2005
@@ -4,7 +4,7 @@
?php
/* include( 'skipif.inc' ); */
if (@iconv('CP932', 'EUC-JP//TRANSLIT', \x87\x6d)=='') {
- die(skip CP932 translit not available\n);
+ die(skip CP932 to EUC-JP translit not available\n);
}
?
--INI--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml/tests bug26614_libxml.phpt
sniper Sun Aug 7 10:22:10 2005 EDT Modified files: /php-src/ext/xml/tests bug26614_libxml.phpt Log: This test failed because libxml versions differ.. http://cvs.php.net/diff.php/php-src/ext/xml/tests/bug26614_libxml.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/xml/tests/bug26614_libxml.phpt diff -u php-src/ext/xml/tests/bug26614_libxml.phpt:1.2 php-src/ext/xml/tests/bug26614_libxml.phpt:1.3 --- php-src/ext/xml/tests/bug26614_libxml.phpt:1.2 Sun Jul 31 17:18:16 2005 +++ php-src/ext/xml/tests/bug26614_libxml.phpt Sun Aug 7 10:22:10 2005 @@ -78,13 +78,13 @@ xml_parser_free($xml_parser); } ? ---EXPECT-- +--EXPECTF-- CDATA -DATA at line 2, col 6 (byte 9) -/DATA at line 9, col 7 (byte 56) +DATA at line 2, col %d (byte 9) +/DATA at line 9, col %d (byte 56) Comment -DATA at line 2, col 6 (byte 9) -/DATA at line 9, col 7 (byte 56) +DATA at line 2, col %d (byte 9) +/DATA at line 9, col %d (byte 56) Text -DATA at line 2, col 6 (byte 9) -/DATA at line 9, col 10 (byte 56) +DATA at line 2, col %d (byte 9) +/DATA at line 9, col %d (byte 56) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php.h
hholzgraSun Aug 7 11:13:51 2005 EDT Modified files: /php-src/main php.h Log: typo fix http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.220r2=1.221ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.220 php-src/main/php.h:1.221 --- php-src/main/php.h:1.220Wed Aug 3 10:08:33 2005 +++ php-src/main/php.h Sun Aug 7 11:13:50 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.220 2005/08/03 14:08:33 sniper Exp $ */ +/* $Id: php.h,v 1.221 2005/08/07 15:13:50 hholzgra Exp $ */ #ifndef PHP_H #define PHP_H @@ -341,7 +341,7 @@ #define PHP_FALIAS ZEND_FALIAS #define PHP_ME ZEND_ME #define PHP_MALIAS ZEND_MALIAS -#define PHP_ASTSRACT_ME ZEND_ABSTRACT_ME +#define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME #define PHP_ME_MAPPING ZEND_ME_MAPPING #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap TODO
iliaa Sun Aug 7 14:33:46 2005 EDT Modified files: /php-src/ext/soap TODO Log: Update todo. http://cvs.php.net/diff.php/php-src/ext/soap/TODO?r1=1.49r2=1.50ty=u Index: php-src/ext/soap/TODO diff -u php-src/ext/soap/TODO:1.49 php-src/ext/soap/TODO:1.50 --- php-src/ext/soap/TODO:1.49 Wed Feb 25 09:04:41 2004 +++ php-src/ext/soap/TODO Sun Aug 7 14:33:45 2005 @@ -35,7 +35,6 @@ ? gDay, ? gMonth) ? proper encoding of standard hexBinary type -? proper encoding of standard base64Binary type ? full support for arrays - SOAP 1.1 encoding of arrays with holes (partially transmitted and sparse arrays) SOAP 1.2 doesn't support partially transmitted and sparse arrays -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
sniper Sun Aug 7 17:00:30 2005 EDT
Modified files:
/php-src/ext/gd config.w32
Log:
Missing entry
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.9r2=1.10ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.9 php-src/ext/gd/config.w32:1.10
--- php-src/ext/gd/config.w32:1.9 Sat Aug 6 18:20:06 2005
+++ php-src/ext/gd/config.w32 Sun Aug 7 17:00:28 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.9 2005/08/06 22:20:06 edink Exp $
+// $Id: config.w32,v 1.10 2005/08/07 21:00:28 sniper Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -32,6 +32,7 @@
gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c,
gd);
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG(CFLAGS_GD, \
+/D HAVE_GD_DYNAMIC_CTX_EX=1 \
/D HAVE_GD_BUNDLED=1 \
/D HAVE_GD_GD2 \
/D HAVE_GD_GIF_READ=1 \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c /ext/standard mail.c /win32 sendmail.c sendmail.h
sniper Sun Aug 7 18:06:29 2005 EDT
Modified files:
/php-src/ext/imap php_imap.c
/php-src/ext/standard mail.c
/php-src/win32 sendmail.c sendmail.h
Log:
- Fixed bug #29334 (mail() provides incorrect message time header)
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.207r2=1.208ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.207 php-src/ext/imap/php_imap.c:1.208
--- php-src/ext/imap/php_imap.c:1.207 Wed Aug 3 10:07:16 2005
+++ php-src/ext/imap/php_imap.c Sun Aug 7 18:06:27 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.207 2005/08/03 14:07:16 sniper Exp $ */
+/* $Id: php_imap.c,v 1.208 2005/08/07 22:06:27 sniper Exp $ */
#define IMAP41
@@ -3346,7 +3346,7 @@
strcat(bufferHeader, headers);
}
- if (TSendMail(INI_STR(SMTP), tsm_err, tsm_errmsg, bufferHeader,
subject, bufferTo, message, bufferCc, bufferBcc, rpath) != SUCCESS) {
+ if (TSendMail(INI_STR(SMTP), tsm_err, tsm_errmsg, bufferHeader,
subject, bufferTo, message, bufferCc, bufferBcc, rpath TSRMLS_CC) != SUCCESS) {
if (tsm_errmsg) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
tsm_errmsg);
efree(tsm_errmsg);
http://cvs.php.net/diff.php/php-src/ext/standard/mail.c?r1=1.86r2=1.87ty=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.86 php-src/ext/standard/mail.c:1.87
--- php-src/ext/standard/mail.c:1.86Wed Aug 3 10:08:08 2005
+++ php-src/ext/standard/mail.c Sun Aug 7 18:06:28 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mail.c,v 1.86 2005/08/03 14:08:08 sniper Exp $ */
+/* $Id: mail.c,v 1.87 2005/08/07 22:06:28 sniper Exp $ */
#include stdlib.h
#include ctype.h
@@ -185,7 +185,7 @@
if (!sendmail_path) {
#if (defined PHP_WIN32 || defined NETWARE)
/* handle old style win smtp sending */
- if (TSendMail(INI_STR(SMTP), tsm_err, tsm_errmsg, headers,
subject, to, message, NULL, NULL, NULL) == FAILURE) {
+ if (TSendMail(INI_STR(SMTP), tsm_err, tsm_errmsg, headers,
subject, to, message, NULL, NULL, NULL TSRMLS_CC) == FAILURE) {
if (tsm_errmsg) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
%s, tsm_errmsg);
efree(tsm_errmsg);
http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.64r2=1.65ty=u
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.64 php-src/win32/sendmail.c:1.65
--- php-src/win32/sendmail.c:1.64 Thu Jul 28 05:44:13 2005
+++ php-src/win32/sendmail.cSun Aug 7 18:06:29 2005
@@ -17,7 +17,7 @@
*
*/
-/* $Id: sendmail.c,v 1.64 2005/07/28 09:44:13 hyanantha Exp $ */
+/* $Id: sendmail.c,v 1.65 2005/08/07 22:06:29 sniper Exp $ */
#include php.h /*php specific */
#include stdio.h
@@ -42,23 +42,15 @@
#include ext/pcre/php_pcre.h
#endif
-#include ext/standard/php_string.h
+#include ext/standard/php_string.h
+#include ext/date/php_date.h
-/*
- extern int _daylight;
- extern long _timezone;
- */
/*enum
{
DO_CONNECT = WM_USER +1
};
*/
-static char *days[] =
-{Sun, Mon, Tue, Wed, Thu, Fri, Sat};
-static char *months[] =
-{Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov,
Dec};
-
/* '*error_message' has to be passed around from php_mail() */
#define SMTP_ERROR_RESPONSE_SPEC SMTP server response: %s
/* Convinient way to handle error messages from the SMTP server.
@@ -98,8 +90,6 @@
char *php_mailer = PHP 4 NetWare;
#endif /* NETWARE */
-char *get_header(char *h, char *headers);
-
/* Error messages */
static char *ErrorMessages[] =
{
@@ -220,13 +210,12 @@
///
PHPAPI int TSendMail(char *host, int *error, char **error_message,
char *headers, char *Subject, char *mailTo, char
*data,
- char *mailCc, char *mailBcc, char *mailRPath)
+ char *mailCc, char *mailBcc, char *mailRPath
TSRMLS_DC)
{
int ret;
char *RPath = NULL;
char *headers_lc = NULL; /* headers_lc is only created if we've a
header at all */
char *pos1 = NULL, *pos2 = NULL;
- TSRMLS_FETCH();
#ifndef NETWARE
WinsockStarted = FALSE;
@@ -311,7 +300,7 @@
MailHost, !INI_INT(smtp_port) ? 25 :
INI_INT(smtp_port));
return FAILURE;
} else {
- ret = SendText(RPath, Subject, mailTo, mailCc, mailBcc, data,
headers, headers_lc, error_message);
+ ret = SendText(RPath, Subject, mailTo, mailCc, mailBcc, data,
headers, headers_lc,
[PHP-CVS] cvs: php-src / NEWS
sniper Sun Aug 7 18:09:07 2005 EDT Modified files: /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2023r2=1.2024ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2023 php-src/NEWS:1.2024 --- php-src/NEWS:1.2023 Sat Aug 6 19:30:49 2005 +++ php-src/NEWSSun Aug 7 18:09:06 2005 @@ -35,6 +35,7 @@ - Fixed bug #33558 (warning with nested calls to functions returning by reference). (Dmitry) - Fixed bug #32139 (SOAP client does not auto-handle base64 encoding). (Ilia) +- Fixed bug #29334 (win32 mail() provides incorrect Date: header). (Jani) 14 Jul 2005, PHP 5.1 Beta 3 - Upgraded bundled SQLite library for PDO:SQLite to 3.2.2 (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
