[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c
georg Thu Aug 12 18:14:06 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
minor fix in mysqli_prepare: copying stmt errormessag to mysql structure
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.90&r2=1.91&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.90 php-src/ext/mysqli/mysqli_api.c:1.91
--- php-src/ext/mysqli/mysqli_api.c:1.90Wed Jul 21 23:23:33 2004
+++ php-src/ext/mysqli/mysqli_api.c Thu Aug 12 18:14:06 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_api.c,v 1.90 2004/07/22 03:23:33 pollita Exp $
+ $Id: mysqli_api.c,v 1.91 2004/08/12 22:14:06 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1243,6 +1243,12 @@
if ((stmt->stmt = mysql_stmt_init(mysql->mysql))) {
if (mysql_stmt_prepare(stmt->stmt, query, query_len)) {
+ if (stmt->stmt->last_errno) {
+ /* if we close the statement handle, we have to copy
the errors to connection handle */
+ mysql->mysql->net.last_errno = stmt->stmt->last_errno;
+ strcpy(mysql->mysql->net.last_error,
stmt->stmt->last_error);
+ strcpy(mysql->mysql->net.sqlstate,
stmt->stmt->sqlstate);
+ }
mysql_stmt_close(stmt->stmt);
stmt->stmt = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mysqli mysqli_api.c
georg Thu Aug 12 18:11:46 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli_api.c
Log:
minor fix in mysqli_prepare: copying stmt errormessag to mysql structure
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.1&r2=1.87.2.2&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.1
php-src/ext/mysqli/mysqli_api.c:1.87.2.2
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.1Wed Jul 21 23:26:59 2004
+++ php-src/ext/mysqli/mysqli_api.c Thu Aug 12 18:11:46 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_api.c,v 1.87.2.1 2004/07/22 03:26:59 pollita Exp $
+ $Id: mysqli_api.c,v 1.87.2.2 2004/08/12 22:11:46 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1243,6 +1243,12 @@
if ((stmt->stmt = mysql_stmt_init(mysql->mysql))) {
if (mysql_stmt_prepare(stmt->stmt, query, query_len)) {
+ if (stmt->stmt->last_errno) {
+ /* if we close the statement handle, we have to copy
the errors to connection handle */
+ mysql->mysql->net.last_errno = stmt->stmt->last_errno;
+ strcpy(mysql->mysql->net.last_error,
stmt->stmt->last_error);
+ strcpy(mysql->mysql->net.sqlstate,
stmt->stmt->sqlstate);
+ }
mysql_stmt_close(stmt->stmt);
stmt->stmt = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h ZendEngine2 zend.h
andiThu Aug 12 16:53:19 2004 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Back to 5.0.2-dev http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.38&r2=1.1760.2.39&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.38 php-src/NEWS:1.1760.2.39 --- php-src/NEWS:1.1760.2.38Thu Aug 12 16:39:36 2004 +++ php-src/NEWSThu Aug 12 16:53:18 2004 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2004, PHP 5.0.2 + 12 Aug 2004, PHP 5.0.1 - Changed destructor mechanism so that destructors are called prior to request shutdown. (Marcus) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.5&r2=1.514.2.6&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.5 php-src/configure.in:1.514.2.6 --- php-src/configure.in:1.514.2.5 Thu Aug 12 16:39:36 2004 +++ php-src/configure.inThu Aug 12 16:53:19 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.5 2004/08/12 20:39:36 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.6 2004/08/12 20:53:19 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -40,8 +40,8 @@ MAJOR_VERSION=5 MINOR_VERSION=0 -RELEASE_VERSION=1 -EXTRA_VERSION="" +RELEASE_VERSION=2 +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.257.2.6&r2=1.257.2.7&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.257.2.6 ZendEngine2/zend.h:1.257.2.7 --- ZendEngine2/zend.h:1.257.2.6Thu Aug 12 16:39:36 2004 +++ ZendEngine2/zend.h Thu Aug 12 16:53:19 2004 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.257.2.6 2004/08/12 20:39:36 andi Exp $ */ +/* $Id: zend.h,v 1.257.2.7 2004/08/12 20:53:19 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.0.1" +#define ZEND_VERSION "2.0.2-dev" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.5&r2=1.97.2.6&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.5 php-src/main/php_version.h:1.97.2.6 --- php-src/main/php_version.h:1.97.2.5 Thu Aug 12 16:39:36 2004 +++ php-src/main/php_version.h Thu Aug 12 16:53:19 2004 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 -#define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.0.1" +#define PHP_RELEASE_VERSION 2 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.0.2-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h ZendEngine2 zend.h
andiThu Aug 12 16:39:37 2004 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Roll 5.0.1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.37&r2=1.1760.2.38&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.37 php-src/NEWS:1.1760.2.38 --- php-src/NEWS:1.1760.2.37Thu Aug 12 03:25:32 2004 +++ php-src/NEWSThu Aug 12 16:39:36 2004 @@ -1,8 +1,6 @@ PHPNEWS ||| -?? ??? 2004, PHP 5.0.1 - -11 Aug 2004, PHP 5.0.1RC2 +12 Aug 2004, PHP 5.0.1 - Changed destructor mechanism so that destructors are called prior to request shutdown. (Marcus) - Rewritten UNIX and Windows install help files. (Documentation Team) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.4&r2=1.514.2.5&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.4 php-src/configure.in:1.514.2.5 --- php-src/configure.in:1.514.2.4 Thu Aug 12 02:39:26 2004 +++ php-src/configure.inThu Aug 12 16:39:36 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.4 2004/08/12 06:39:26 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.5 2004/08/12 20:39:36 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=1 -EXTRA_VERSION="-dev" +EXTRA_VERSION="" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.257.2.5&r2=1.257.2.6&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.257.2.5 ZendEngine2/zend.h:1.257.2.6 --- ZendEngine2/zend.h:1.257.2.5Thu Aug 12 02:39:26 2004 +++ ZendEngine2/zend.h Thu Aug 12 16:39:36 2004 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.257.2.5 2004/08/12 06:39:26 andi Exp $ */ +/* $Id: zend.h,v 1.257.2.6 2004/08/12 20:39:36 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.0.1-dev" +#define ZEND_VERSION "2.0.1" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.4&r2=1.97.2.5&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.4 php-src/main/php_version.h:1.97.2.5 --- php-src/main/php_version.h:1.97.2.4 Thu Aug 12 02:39:26 2004 +++ php-src/main/php_version.h Thu Aug 12 16:39:36 2004 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.0.1-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.0.1" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/imap php_imap.c
chagenbuThu Aug 12 15:33:00 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/imap php_imap.c Log: More spaces -> tabs. http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.27&r2=1.142.2.28&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.142.2.27 php-src/ext/imap/php_imap.c:1.142.2.28 --- php-src/ext/imap/php_imap.c:1.142.2.27 Thu Aug 12 15:20:19 2004 +++ php-src/ext/imap/php_imap.c Thu Aug 12 15:32:59 2004 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_imap.c,v 1.142.2.27 2004/08/12 19:20:19 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.142.2.28 2004/08/12 19:32:59 chagenbu Exp $ */ #define IMAP41 @@ -112,7 +112,7 @@ PHP_FE(imap_qprint, NULL) PHP_FE(imap_8bit, NULL) PHP_FE(imap_binary, NULL) - PHP_FE(imap_utf8, NULL) + PHP_FE(imap_utf8, NULL) PHP_FE(imap_status, NULL) PHP_FE(imap_mailboxmsginfo, NULL) PHP_FE(imap_setflag_full, NULL) @@ -131,7 +131,7 @@ PHP_FE(imap_utf7_encode,NULL) PHP_FE(imap_mime_header_decode, NULL) PHP_FE(imap_thread, NULL) - PHP_FE(imap_timeout, NULL) + PHP_FE(imap_timeout,NULL) #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) PHP_FE(imap_get_quota, NULL) @@ -142,12 +142,12 @@ PHP_FE(imap_mail, NULL) - PHP_FALIAS(imap_header, imap_headerinfo,NULL) - PHP_FALIAS(imap_listmailbox,imap_list, NULL) - PHP_FALIAS(imap_getmailboxes, imap_list_full, NULL) - PHP_FALIAS(imap_scanmailbox,imap_listscan, NULL) - PHP_FALIAS(imap_listsubscribed, imap_lsub, NULL) - PHP_FALIAS(imap_getsubscribed, imap_lsub_full, NULL) + PHP_FALIAS(imap_header, imap_headerinfo,NULL) + PHP_FALIAS(imap_listmailbox,imap_list, NULL) + PHP_FALIAS(imap_getmailboxes, imap_list_full, NULL) + PHP_FALIAS(imap_scanmailbox,imap_listscan, NULL) + PHP_FALIAS(imap_listsubscribed, imap_lsub, NULL) + PHP_FALIAS(imap_getsubscribed, imap_lsub_full, NULL) PHP_FALIAS(imap_fetchtext, imap_body, NULL) PHP_FALIAS(imap_scan, imap_listscan, NULL) PHP_FALIAS(imap_create, imap_createmailbox, NULL) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/imap php_imap.c
chagenbuThu Aug 12 15:32:18 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/imap php_imap.c Log: More spaces -> tabs. http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.3&r2=1.184.2.4&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.184.2.3 php-src/ext/imap/php_imap.c:1.184.2.4 --- php-src/ext/imap/php_imap.c:1.184.2.3 Thu Aug 12 15:20:17 2004 +++ php-src/ext/imap/php_imap.c Thu Aug 12 15:32:18 2004 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_imap.c,v 1.184.2.3 2004/08/12 19:20:17 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.184.2.4 2004/08/12 19:32:18 chagenbu Exp $ */ #define IMAP41 @@ -112,7 +112,7 @@ PHP_FE(imap_qprint, NULL) PHP_FE(imap_8bit, NULL) PHP_FE(imap_binary, NULL) - PHP_FE(imap_utf8, NULL) + PHP_FE(imap_utf8, NULL) PHP_FE(imap_status, NULL) PHP_FE(imap_mailboxmsginfo, NULL) PHP_FE(imap_setflag_full, NULL) @@ -131,24 +131,24 @@ PHP_FE(imap_utf7_encode,NULL) PHP_FE(imap_mime_header_decode, NULL) PHP_FE(imap_thread, NULL) - PHP_FE(imap_timeout, NULL) + PHP_FE(imap_timeout,NULL) #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) PHP_FE(imap_get_quota, NULL) PHP_FE(imap_get_quotaroot, NULL) PHP_FE(imap_set_quota, NULL) - PHP_FE(imap_setacl, NULL) - PHP_FE(imap_getacl, NULL) + PHP_FE(imap_setacl, NULL) + PHP_FE(imap_getacl, NULL) #endif PHP_FE(imap_mail, NULL) - PHP_FALIAS(imap_header, imap_headerinfo,NULL) - PHP_FALIAS(imap_listmailbox,imap_list, NULL) - PHP_FALIAS(imap_getmailboxes, imap_list_full, NULL) - PHP_FALIAS(imap_scanmailbox,imap_listscan, NULL) - PHP_FALIAS(imap_listsubscribed, imap_lsub, NULL) - PHP_FALIAS(imap_getsubscribed, imap_lsub_full, NULL) + PHP_FALIAS(imap_header, imap_headerinfo,NULL) + PHP_FALIAS(imap_listmailbox,imap_list, NULL) + PHP_FALIAS(imap_getmailboxes, imap_list_full, NULL) + PHP_FALIAS(imap_scanmailbox,imap_listscan, NULL) + PHP_FALIAS(imap_listsubscribed, imap_lsub, NULL) + PHP_FALIAS(imap_getsubscribed, imap_lsub_full, NULL) PHP_FALIAS(imap_fetchtext, imap_body, NULL) PHP_FALIAS(imap_scan, imap_listscan, NULL) PHP_FALIAS(imap_create, imap_createmailbox, NULL) -- 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
chagenbuThu Aug 12 15:31:36 2004 EDT
Modified files:
/php-src/ext/imap php_imap.c
Log:
More spaces -> tabs.
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.187&r2=1.188&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.187 php-src/ext/imap/php_imap.c:1.188
--- php-src/ext/imap/php_imap.c:1.187 Thu Aug 12 15:20:15 2004
+++ php-src/ext/imap/php_imap.c Thu Aug 12 15:31:36 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.187 2004/08/12 19:20:15 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.188 2004/08/12 19:31:36 chagenbu Exp $ */
#define IMAP41
@@ -112,7 +112,7 @@
PHP_FE(imap_qprint,
NULL)
PHP_FE(imap_8bit,
NULL)
PHP_FE(imap_binary,
NULL)
- PHP_FE(imap_utf8, NULL)
+ PHP_FE(imap_utf8,
NULL)
PHP_FE(imap_status,
NULL)
PHP_FE(imap_mailboxmsginfo, NULL)
PHP_FE(imap_setflag_full, NULL)
@@ -137,18 +137,18 @@
PHP_FE(imap_get_quota, NULL)
PHP_FE(imap_get_quotaroot, NULL)
PHP_FE(imap_set_quota, NULL)
- PHP_FE(imap_setacl,
NULL)
- PHP_FE(imap_getacl,
NULL)
+ PHP_FE(imap_setacl,
NULL)
+ PHP_FE(imap_getacl,
NULL)
#endif
PHP_FE(imap_mail,
NULL)
- PHP_FALIAS(imap_header, imap_headerinfo,NULL)
- PHP_FALIAS(imap_listmailbox,imap_list, NULL)
- PHP_FALIAS(imap_getmailboxes, imap_list_full, NULL)
- PHP_FALIAS(imap_scanmailbox,imap_listscan, NULL)
- PHP_FALIAS(imap_listsubscribed, imap_lsub, NULL)
- PHP_FALIAS(imap_getsubscribed, imap_lsub_full, NULL)
+ PHP_FALIAS(imap_header, imap_headerinfo,NULL)
+ PHP_FALIAS(imap_listmailbox,imap_list, NULL)
+ PHP_FALIAS(imap_getmailboxes, imap_list_full, NULL)
+ PHP_FALIAS(imap_scanmailbox,imap_listscan, NULL)
+ PHP_FALIAS(imap_listsubscribed, imap_lsub, NULL)
+ PHP_FALIAS(imap_getsubscribed, imap_lsub_full, NULL)
PHP_FALIAS(imap_fetchtext, imap_body, NULL)
PHP_FALIAS(imap_scan, imap_listscan, NULL)
PHP_FALIAS(imap_create, imap_createmailbox, NULL)
@@ -1821,8 +1821,7 @@
/* only perform the check if the msgno is a message number and not a
UID */
PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
}
-
-
+
body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno),
Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);
if (!body) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/imap php_imap.c
On August 12, 2004 02:44 pm, Chuck Hagenbuch wrote: > Christ. I was just fixing Ilia's bug that no one was willing to do crap > about. I don't know where about you are located, but where I am at, right now it is the middle of a business day. Which means most people (myself included) are working on paid projects and not PHP stuff. That said I have seen the report and was going to look at it this evening. Release candidates that both Andi and I release are made for the explicit purpose of detecting these problems. While Tony and I did not anticipate the problem you reported, this is no reason to whine and throw blame around. Your very own hastily thrown "fix" had a bug in it. > I > haven't committed anything to php-src in years now and damned if I care > about the whitespace. Given that you're commit is mere 4 lines, surely you could take 30 seconds and make sure it resembles readable code, no? > > Give respect, get respect. Act like an ass, well, then I'll fix what I > can how I > can. Indeed. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/imap php_imap.c
iliaa Thu Aug 12 15:20:17 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/imap php_imap.c
Log:
MFH: Properly fix the msgno check inside imap_fetchbody().
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.2&r2=1.184.2.3&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.2 php-src/ext/imap/php_imap.c:1.184.2.3
--- php-src/ext/imap/php_imap.c:1.184.2.2 Thu Aug 12 14:02:03 2004
+++ php-src/ext/imap/php_imap.c Thu Aug 12 15:20:17 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.184.2.2 2004/08/12 18:02:03 chagenbu Exp $ */
+/* $Id: php_imap.c,v 1.184.2.3 2004/08/12 19:20:17 iliaa Exp $ */
#define IMAP41
@@ -1816,13 +1816,12 @@
if (myargc == 4) {
convert_to_long_ex(flags);
}
-
-if (myargc < 4 || !Z_LVAL_PP(flags) & FT_UID) {
-/* If we're fetching via UID, checking the range of msgno is
- DUMB. */
-PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
-}
-
+
+ if (myargc < 4 || !(Z_LVAL_PP(flags) & FT_UID)) {
+ /* only perform the check if the msgno is a message number and not a
UID */
+ PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+ }
+
body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno),
Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);
if (!body) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/imap php_imap.c
iliaa Thu Aug 12 15:20:19 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/imap php_imap.c
Log:
MFH: Properly fix the msgno check inside imap_fetchbody().
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.26&r2=1.142.2.27&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.26 php-src/ext/imap/php_imap.c:1.142.2.27
--- php-src/ext/imap/php_imap.c:1.142.2.26 Thu Aug 12 14:02:14 2004
+++ php-src/ext/imap/php_imap.c Thu Aug 12 15:20:19 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.142.2.26 2004/08/12 18:02:14 chagenbu Exp $ */
+/* $Id: php_imap.c,v 1.142.2.27 2004/08/12 19:20:19 iliaa Exp $ */
#define IMAP41
@@ -1775,13 +1775,12 @@
if (myargc == 4) {
convert_to_long_ex(flags);
}
-
-if (myargc < 4 || !Z_LVAL_PP(flags) & FT_UID) {
-/* If we're fetching via UID, checking the range of msgno is
- DUMB. */
-PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
-}
-
+
+ if (myargc < 4 || !(Z_LVAL_PP(flags) & FT_UID)) {
+ /* only perform the check if the msgno is a message number and not a
UID */
+ PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+ }
+
body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno),
Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);
if (!body) {
--
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
iliaa Thu Aug 12 15:20:15 2004 EDT
Modified files:
/php-src/ext/imap php_imap.c
Log:
Properly fix the msgno check inside imap_fetchbody().
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.186&r2=1.187&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.186 php-src/ext/imap/php_imap.c:1.187
--- php-src/ext/imap/php_imap.c:1.186 Thu Aug 12 14:01:45 2004
+++ php-src/ext/imap/php_imap.c Thu Aug 12 15:20:15 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.186 2004/08/12 18:01:45 chagenbu Exp $ */
+/* $Id: php_imap.c,v 1.187 2004/08/12 19:20:15 iliaa Exp $ */
#define IMAP41
@@ -1817,11 +1817,11 @@
convert_to_long_ex(flags);
}
-if (myargc < 4 || !Z_LVAL_PP(flags) & FT_UID) {
-/* If we're fetching via UID, checking the range of msgno is
- DUMB. */
-PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
-}
+ if (myargc < 4 || !(Z_LVAL_PP(flags) & FT_UID)) {
+ /* only perform the check if the msgno is a message number and not a
UID */
+ PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+ }
+
body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno),
Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/imap php_imap.c
On Thu, 12 Aug 2004, Chuck Hagenbuch wrote: > Quoting Derick Rethans <[EMAIL PROTECTED]>: > > >> chagenbu Thu Aug 12 14:01:45 2004 EDT > >> > >> Modified files: > >> /php-src/ext/imap php_imap.c > >> Log: > >> fix. > > > > Allways say what you fix, and please fix the whitespace! > > Christ. I was just fixing Ilia's bug that no one was willing to do > crap about. I haven't committed anything to php-src in years now and > damned if I care about the whitespace. 1. Wez was pissed that Jan was wining, we are all busy and sometimes it just takes some time before things are taken care of. 2. It doesn't mean jackass if you didn't commit in years, you still respect guidelines, if not: don't bother committing. > Give respect, get respect. Act like an ass, well, then I'll fix what I > can how I can. 3. Look at yourself before calling somebody else an ass. Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/imap php_imap.c
*boggle* Come on Chuck, there are coding standards for a reason. There is never a rush to commit. Stuff breaks in CVS, then it gets fixed. Jans original email was only sent 7 hours ago; the way you guys are acting is as though it's been broken for months with no one listening to your patient requests. --Wez. On Thu, 12 Aug 2004 14:44:36 -0400, Chuck Hagenbuch <[EMAIL PROTECTED]> wrote: > Quoting Derick Rethans <[EMAIL PROTECTED]>: > > >> chagenbu Thu Aug 12 14:01:45 2004 EDT > >> > >> Modified files: > >> /php-src/ext/imapphp_imap.c > >> Log: > >> fix. > > > > Allways say what you fix, and please fix the whitespace! > > Christ. I was just fixing Ilia's bug that no one was willing to do crap > about. I > haven't committed anything to php-src in years now and damned if I care about > the whitespace. > > Give respect, get respect. Act like an ass, well, then I'll fix what I > can how I > can. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/imap php_imap.c
Quoting Derick Rethans <[EMAIL PROTECTED]>: chagenbuThu Aug 12 14:01:45 2004 EDT Modified files: /php-src/ext/imap php_imap.c Log: fix. Allways say what you fix, and please fix the whitespace! Christ. I was just fixing Ilia's bug that no one was willing to do crap about. I haven't committed anything to php-src in years now and damned if I care about the whitespace. Give respect, get respect. Act like an ass, well, then I'll fix what I can how I can. -chuck -- "Regard my poor demoralized mule!" - Juan Valdez -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/imap php_imap.c
On Thu, 12 Aug 2004, Chuck Hagenbuch wrote: > chagenbu Thu Aug 12 14:01:45 2004 EDT > > Modified files: > /php-src/ext/imap php_imap.c > Log: > fix. Allways say what you fix, and please fix the whitespace! Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Thu Aug 12 14:34:56 2004 EDT Modified files: /CVSROOTavail Log: newt karma for michael http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.898&r2=1.899&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.898 CVSROOT/avail:1.899 --- CVSROOT/avail:1.898 Tue Aug 10 04:33:08 2004 +++ CVSROOT/avail Thu Aug 12 14:34:55 2004 @@ -223,7 +223,7 @@ avail|schst,luckec|pecl/id3 avail|gabe,jlesueur|pecl/zeroconf avail|curt|pecl/postparser - +avail|michael|pecl/newt # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/imap php_imap.c
chagenbuThu Aug 12 14:02:15 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/imap php_imap.c
Log:
MFH: fix.
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.25&r2=1.142.2.26&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.25 php-src/ext/imap/php_imap.c:1.142.2.26
--- php-src/ext/imap/php_imap.c:1.142.2.25 Wed Jul 21 17:57:13 2004
+++ php-src/ext/imap/php_imap.c Thu Aug 12 14:02:14 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.142.2.25 2004/07/21 21:57:13 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.26 2004/08/12 18:02:14 chagenbu Exp $ */
#define IMAP41
@@ -1776,7 +1776,11 @@
convert_to_long_ex(flags);
}
- PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+if (myargc < 4 || !Z_LVAL_PP(flags) & FT_UID) {
+/* If we're fetching via UID, checking the range of msgno is
+ DUMB. */
+PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+}
body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno),
Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/imap php_imap.c
chagenbuThu Aug 12 14:02:03 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/imap php_imap.c
Log:
MFH: fix.
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.184.2.1&r2=1.184.2.2&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.184.2.1 php-src/ext/imap/php_imap.c:1.184.2.2
--- php-src/ext/imap/php_imap.c:1.184.2.1 Wed Jul 21 17:57:09 2004
+++ php-src/ext/imap/php_imap.c Thu Aug 12 14:02:03 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.184.2.1 2004/07/21 21:57:09 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.184.2.2 2004/08/12 18:02:03 chagenbu Exp $ */
#define IMAP41
@@ -1817,7 +1817,11 @@
convert_to_long_ex(flags);
}
- PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+if (myargc < 4 || !Z_LVAL_PP(flags) & FT_UID) {
+/* If we're fetching via UID, checking the range of msgno is
+ DUMB. */
+PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+}
body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno),
Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);
--
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
chagenbuThu Aug 12 14:01:45 2004 EDT
Modified files:
/php-src/ext/imap php_imap.c
Log:
fix.
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.185&r2=1.186&ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.185 php-src/ext/imap/php_imap.c:1.186
--- php-src/ext/imap/php_imap.c:1.185 Wed Jul 21 17:57:03 2004
+++ php-src/ext/imap/php_imap.c Thu Aug 12 14:01:45 2004
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.185 2004/07/21 21:57:03 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.186 2004/08/12 18:01:45 chagenbu Exp $ */
#define IMAP41
@@ -1816,8 +1816,12 @@
if (myargc == 4) {
convert_to_long_ex(flags);
}
-
- PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+
+if (myargc < 4 || !Z_LVAL_PP(flags) & FT_UID) {
+/* If we're fetching via UID, checking the range of msgno is
+ DUMB. */
+PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno));
+}
body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno),
Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes iterators_001.phpt iterators_002.phpt
helly Thu Aug 12 04:01:42 2004 EDT
Modified files:
/php-src/tests/classes iterators_001.phpt iterators_002.phpt
Log:
Fix tests after foreach patch
http://cvs.php.net/diff.php/php-src/tests/classes/iterators_001.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/tests/classes/iterators_001.phpt
diff -u php-src/tests/classes/iterators_001.phpt:1.3
php-src/tests/classes/iterators_001.phpt:1.4
--- php-src/tests/classes/iterators_001.phpt:1.3Mon Mar 8 12:33:27 2004
+++ php-src/tests/classes/iterators_001.phptThu Aug 12 04:01:41 2004
@@ -110,17 +110,14 @@
c_iter::__construct
c_iter::valid = true
c_iter::current
-c_iter::key
object:0
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
object:1
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
object:2
c_iter::next
c_iter::valid = false
@@ -129,66 +126,54 @@
c_iter::__construct
c_iter::valid = true
c_iter::current
-c_iter::key
c::getIterator
c_iter::__construct
c_iter::valid = true
c_iter::current
-c_iter::key
double:0:0
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
double:0:1
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
double:0:2
c_iter::next
c_iter::valid = false
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
c::getIterator
c_iter::__construct
c_iter::valid = true
c_iter::current
-c_iter::key
double:1:0
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
double:1:1
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
double:1:2
c_iter::next
c_iter::valid = false
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
c::getIterator
c_iter::__construct
c_iter::valid = true
c_iter::current
-c_iter::key
double:2:0
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
double:2:1
c_iter::next
c_iter::valid = true
c_iter::current
-c_iter::key
double:2:2
c_iter::next
c_iter::valid = false
http://cvs.php.net/diff.php/php-src/tests/classes/iterators_002.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/tests/classes/iterators_002.phpt
diff -u php-src/tests/classes/iterators_002.phpt:1.3
php-src/tests/classes/iterators_002.phpt:1.4
--- php-src/tests/classes/iterators_002.phpt:1.3Mon Mar 8 12:33:27 2004
+++ php-src/tests/classes/iterators_002.phptThu Aug 12 04:01:41 2004
@@ -60,7 +60,7 @@
$t = new c();
-foreach($t as $v) {
+foreach($t as $k => $v) {
foreach($t as $w) {
echo "double:$v:$w\n";
break;
@@ -83,7 +83,6 @@
c_iter::rewind
c_iter::valid = true
c_iter::current
-c_iter::key
double:0:0
c_iter::__destruct
c_iter::next
@@ -95,7 +94,6 @@
c_iter::rewind
c_iter::valid = true
c_iter::current
-c_iter::key
double:1:0
c_iter::__destruct
c_iter::next
@@ -107,7 +105,6 @@
c_iter::rewind
c_iter::valid = true
c_iter::current
-c_iter::key
double:2:0
c_iter::__destruct
c_iter::next
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
derick Thu Aug 12 03:25:38 2004 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: - Reorder a bit and add . http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.36&r2=1.1760.2.37&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.36 php-src/NEWS:1.1760.2.37 --- php-src/NEWS:1.1760.2.36Thu Aug 12 02:35:21 2004 +++ php-src/NEWSThu Aug 12 03:25:32 2004 @@ -3,14 +3,14 @@ ?? ??? 2004, PHP 5.0.1 11 Aug 2004, PHP 5.0.1RC2 -- Fixed bug #29606 (php_strip_whitespace() prints to stdout rather then - returning the value). (Ilia) - Changed destructor mechanism so that destructors are called prior to request shutdown. (Marcus) - Rewritten UNIX and Windows install help files. (Documentation Team) - Updated several libraries bundled with the windows release which now includes libxml2-2.6.11, libxslt-1.1.7 and iconv-1.9.1. (Rob, Edin) - Improved and moved ActiveScript SAPI to PECL. (Wez) +- Fixed bug #29606 (php_strip_whitespace() prints to stdout rather then + returning the value). (Ilia) - Fixed bug #29577 (MYSQLI_CLIENT_FOUND_ROWS undefined) (Georg) - Fixed bug #29573 (Segmentation fault, when exception thrown within PHP function called from XSLT). (Christian) @@ -57,7 +57,7 @@ raise an ReflectionException instead of returning NULL on failure. (Sebastian) - Fixed convert.* filters to consume remaining buckets_in on flush. (Sara) -- Fixed bug in mysqli->client_version (Georg) +- Fixed bug in mysqli->client_version. (Georg) 13 Jul 2004, PHP 5.0.0 - Updated PCRE to provide better error handling in certain cases. (Andrei) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
