[PHP4BETA] CVS update: php4/ext/sybase

Date: Monday April 26, 1999 @ 13:26 Author: zeev Update of /repository/php4/ext/sybase In directory php:/tmp/cvs-serv18494/ext/sybase Modified Files: sybase.c Log Message: * Get the Apache module to compile again * Get rid of php3_rqst, use SG(server_context) instead (there's still Apache-specific code, but it nuked a global) Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.1 php4/ext/sybase/sybase.c:1.2 --- php4/ext/sybase/sybase.c:1.1 Wed Apr 21 22:48:26 1999 +++ php4/ext/sybase/sybase.c Mon Apr 26 13:26:37 1999 @@ -31,7 +31,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.1 1999/04/22 02:48:26 ssb Exp $ */ +/* $Id: sybase.c,v 1.2 1999/04/26 17:26:37 zeev Exp $ */ #ifndef MSVC5 @@ -394,9 +394,6 @@ php3_sybase_module.num_links++; } else { /* we do */ if (le->type != php3_sybase_module.le_plink) { -#if BROKEN_SYBASE_PCONNECTS - log_error("PHP/Sybase: Hashed persistent link is not a Sybase link!",php3_rqst->server); -#endif php3_error(E_WARNING,"Sybase: Hashed persistent link is not a Sybase link!"); RETURN_FALSE; } @@ -404,25 +401,13 @@ sybase_ptr = (sybase_link *) le->ptr; /* test that the link hasn't died */ if (DBDEAD(sybase_ptr->link)==TRUE) { -#if BROKEN_SYBASE_PCONNECTS - log_error("PHP/Sybase: Persistent link died, trying to reconnect...",php3_rqst->server); -#endif if ((sybase_ptr->link=dbopen(sybase_ptr->login,host))==FAIL) { -#if BROKEN_SYBASE_PCONNECTS - log_error("PHP/Sybase: Unable to reconnect!",php3_rqst->server); -#endif /*php3_error(E_WARNING,"Sybase: Link to server lost, unable to reconnect");*/ _php3_hash_del(plist, hashed_details, hashed_details_length+1); efree(hashed_details); RETURN_FALSE; } -#if BROKEN_SYBASE_PCONNECTS - log_error("PHP/Sybase: Reconnect successful!",php3_rqst->server); -#endif if (dbsetopt(sybase_ptr->link,DBBUFFER,"2",-1)==FAIL) { -#if BROKEN_SYBASE_PCONNECTS - log_error("PHP/Sybase: Unable to set required options",php3_rqst->server); -#endif _php3_hash_del(plist, hashed_details, hashed_details_length+1); efree(hashed_details); RETURN_FALSE; -- PHP 4 Beta