summaryrefslogtreecommitdiff
path: root/ext/sybase
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-04-26 17:26:37 +0000
committerZeev Suraski <zeev@php.net>1999-04-26 17:26:37 +0000
commit3cd0af11eea32f802228004af8fe424c62c8fbfb (patch)
tree1d273a469ad6e9e2c7e97449fa12665e46156dbf /ext/sybase
parent0f195a79cd25447d03eb2ad9451829b36dcaa49b (diff)
downloadphp-git-3cd0af11eea32f802228004af8fe424c62c8fbfb.tar.gz
* 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)
Diffstat (limited to 'ext/sybase')
-rw-r--r--ext/sybase/sybase.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c
index 11d5fcd768..df17867142 100644
--- a/ext/sybase/sybase.c
+++ b/ext/sybase/sybase.c
@@ -394,9 +394,6 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
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 @@ static void php3_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
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;