You should always first commit to HEAD (in the current
situation, that is the php5 module HEAD).
And if you're going to MFH, then you don't use the
@- foo in your commit message, but manually add the
message to NEWS file. (as I hope you don't have access
elsewhere but ext/informix, you can mention the need
for such addition in the commit message when you MFH.)
MFH = Merge From HEAD
--Jani
ps. This was about both of these commits and to prevent
causing extra work to me in the future..
I will do the MFB for you, so you don't have
to worry about that now.
On Thu, 20 Feb 2003, Corne' Cornelius wrote:
>nobbie Thu Feb 20 06:57:28 2003 EDT
>
> Modified files: (Branch: PHP_4_3)
> /php4/ext/informix php_informix_includes.h
> Log:
>
> #- Changed sizes of char[] in IFX_RES: connecid, cursorid, descrpid, statemid
> from 16 to 32 to prevents possible overflow
>
>
>Index: php4/ext/informix/php_informix_includes.h
>diff -u php4/ext/informix/php_informix_includes.h:1.1.4.1
>php4/ext/informix/php_informix_includes.h:1.1.4.2
>--- php4/ext/informix/php_informix_includes.h:1.1.4.1 Tue Dec 31 11:34:44 2002
>+++ php4/ext/informix/php_informix_includes.h Thu Feb 20 06:57:28 2003
>@@ -19,7 +19,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: php_informix_includes.h,v 1.1.4.1 2002/12/31 16:34:44 sebastian Exp $ */
>+/* $Id: php_informix_includes.h,v 1.1.4.2 2003/02/20 11:57:28 nobbie Exp $ */
>
> #ifndef PHP_INFORMIX_INCLUDES_H
> #define PHP_INFORMIX_INCLUDES_H
>@@ -37,10 +37,10 @@
>
> /* query result set data */
> typedef struct ifx_res {
>- char connecid[16];
>- char cursorid[16];
>- char descrpid[16];
>- char statemid[16];
>+ char connecid[32];
>+ char cursorid[32];
>+ char descrpid[32];
>+ char statemid[32];
> int isscroll;
> int ishold;
> int iscursory;
>
>
>
>
--
<- For Sale! ->
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
