Re: Sybase Patch. Could someone review it please? it is small. (Zeev? Joey?)
| From: | PHP development @echospace | Date: | Wed, 02 May 2001 18:13:17 +0000 |
| Subject: | Re: Sybase Patch. Could someone review it please? it is small. (Zeev? Joey?) | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-53397@lists.php.net to get a copy of this message | ||
Andi,
Patch is attached. When you apply it, please tell me and I'll close related bug reports (there
are a few, and they look different although they are about the same problem).
Vlad
----- Original Message -----
From: Andi Gutmans
To: "PHP development @echospace" ,php-dev@lists.php.net
Sent: Wed, 02 May 2001 20:17:50 +0300
Subject: Re: [PHP-DEV] Sybase Patch. Could someone review it please? it is small. (Zeev? Joey?)
Can you please send the .diff as an attachment so that I can apply it easily?
I'll apply it (I hope it's OK :)
Andi
At 10:05 AM 5/2/2001 -0700, PHP development @echospace wrote:
> Hi, there. Sorry for picking your names, Zeev and Joey, but Zeev is
> listed as a maintainer, and Joey has assigned this particular bug to
> himself. I have been trying to find someone to look at the patch, see if
> you like it, and apply it (I do not have the karma myself), or tell me
> what you don't like. But nobody seemed to respond:(
>
>I posted the patch in the bug description of bug 8126.
>http://bugs.php.net/?id=8126
>
>Thanks,
>
>Vlad
>
>________________________________________
>Re-thinking the Web on a SinglePage(TM)
>http://www.echospace.com
>
>
>--
>PHP Development Mailing List <http://www.php.net/>
>To unsubscribe, e-mail: php-dev-unsubscribe@lists.php.net
>For additional commands, e-mail: php-dev-help@lists.php.net
>To contact the list administrators, e-mail: php-list-admin@lists.php.net
________________________________________
Re-thinking the Web on a SinglePage(TM)
http://www.echospace.com
diff -urN php-4.0.5-tdsbroken/ext/sybase/config.m4 php-4.0.5/ext/sybase/config.m4 --- php-4.0.5-tdsbroken/ext/sybase/config.m4 Mon May 1 21:27:02 2000 +++ php-4.0.5/ext/sybase/config.m4 Tue May 1 16:28:14 2001 @@ -21,4 +21,8 @@ AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ]) ]) AC_DEFINE(HAVE_SYBASE,1,[ ]) + AC_CHECK_LIB(sybdb, tdsdbopen, + [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ]) + AC_DEFINE(DBMFIX,1,[ ]) ], + [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ]) fi diff -urN php-4.0.5-tdsbroken/ext/sybase/php_sybase_db.c php-4.0.5/ext/sybase/php_sybase_db.c --- php-4.0.5-tdsbroken/ext/sybase/php_sybase_db.c Sun Feb 25 22:07:24 2001 +++ php-4.0.5/ext/sybase/php_sybase_db.c Tue May 1 15:42:54 2001 @@ -379,7 +379,7 @@ RETURN_FALSE; } /* create the link */ - if ((sybase.link=dbopen(sybase.login,host))==FAIL) { + if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==FAIL) { /*php_error(E_WARNING,"Sybase: Unable to connect to server: %s",sybase_error(sybase));*/ efree(hashed_details); dbloginfree(sybase.login); @@ -415,7 +415,7 @@ sybase_ptr = (sybase_link *) le->ptr; /* test that the link hasn't died */ if (DBDEAD(sybase_ptr->link)==TRUE) { - if ((sybase_ptr->link=dbopen(sybase_ptr->login,host))==FAIL) { + if ((sybase_ptr->link=PHP_SYBASE_DBOPEN(sybase_ptr->login,host))==FAIL) { /*php_error(E_WARNING,"Sybase: Link to server lost, unable to reconnect");*/ zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1); efree(hashed_details); @@ -462,7 +462,7 @@ RETURN_FALSE; } - if ((sybase.link=dbopen(sybase.login,host))==NULL) { + if ((sybase..link=PHP_SYBASE_DBOPEN(sybase.login,host))==NULL) { /*php_error(E_WARNING,"Sybase: Unable to connect to server: %s",sybase_error(sybase));*/ efree(hashed_details); RETURN_FALSE;
diff -urN php-4.0.5-tdsbroken/ext/sybase/config.m4 php-4.0.5/ext/sybase/config.m4 --- php-4.0.5-tdsbroken/ext/sybase/config.m4 Mon May 1 21:27:02 2000 +++ php-4.0.5/ext/sybase/config.m4 Tue May 1 16:28:14 2001 @@ -21,4 +21,8 @@ AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ]) ]) AC_DEFINE(HAVE_SYBASE,1,[ ]) + AC_CHECK_LIB(sybdb, tdsdbopen, + [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ]) + AC_DEFINE(DBMFIX,1,[ ]) ], + [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ]) fi diff -urN php-4.0.5-tdsbroken/ext/sybase/php_sybase_db.c php-4.0.5/ext/sybase/php_sybase_db.c --- php-4.0.5-tdsbroken/ext/sybase/php_sybase_db.c Sun Feb 25 22:07:24 2001 +++ php-4.0.5/ext/sybase/php_sybase_db.c Tue May 1 15:42:54 2001 @@ -379,7 +379,7 @@ RETURN_FALSE; } /* create the link */ - if ((sybase.link=dbopen(sybase.login,host))==FAIL) { + if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==FAIL) { /*php_error(E_WARNING,"Sybase: Unable to connect to server: %s",sybase_error(sybase));*/ efree(hashed_details); dbloginfree(sybase.login); @@ -415,7 +415,7 @@ sybase_ptr = (sybase_link *) le->ptr; /* test that the link hasn't died */ if (DBDEAD(sybase_ptr->link)==TRUE) { - if ((sybase_ptr->link=dbopen(sybase_ptr->login,host))==FAIL) { + if ((sybase_ptr->link=PHP_SYBASE_DBOPEN(sybase_ptr->login,host))==FAIL) { /*php_error(E_WARNING,"Sybase: Link to server lost, unable to reconnect");*/ zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1); efree(hashed_details); @@ -462,7 +462,7 @@ RETURN_FALSE; } - if ((sybase.link=dbopen(sybase.login,host))==NULL) { + if ((sybase..link=PHP_SYBASE_DBOPEN(sybase.login,host))==NULL) { /*php_error(E_WARNING,"Sybase: Unable to connect to server: %s",sybase_error(sybase));*/ efree(hashed_details); RETURN_FALSE;