[PHP4BETA] CVS update: php4/dl/mssql

Date: Monday April 26, 1999 @ 13:26 Author: zeev Update of /repository/php4/dl/mssql In directory php:/tmp/cvs-serv18494/dl/mssql Modified Files: mssql.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/dl/mssql/mssql.c diff -u php4/dl/mssql/mssql.c:1.3 php4/dl/mssql/mssql.c:1.4 --- php4/dl/mssql/mssql.c:1.3 Fri Apr 23 16:05:53 1999 +++ php4/dl/mssql/mssql.c Mon Apr 26 13:26:33 1999 @@ -448,9 +448,6 @@ msSQL_GLOBAL(num_links++); } else { /* we do */ if (le->type != msSQL_GLOBAL(le_plink)) { -#if BROKEN_MSSQL_PCONNECTS - log_error("PHP/MS SQL: Hashed persistent link is not a MS SQL link!",php3_rqst->server); -#endif php3_error(E_WARNING,"MS SQL: Hashed persistent link is not a MS SQL link!"); RETURN_FALSE; } @@ -458,26 +455,14 @@ mssql_ptr = (mssql_link *) le->ptr; /* test that the link hasn't died */ if (DBDEAD(mssql_ptr->link)==TRUE) { -#if BROKEN_MSSQL_PCONNECTS - log_error("PHP/MS SQL: Persistent link died, trying to reconnect...",php3_rqst->server); -#endif if ((mssql_ptr->link=dbopen(mssql_ptr->login,host))==FAIL) { -#if BROKEN_MSSQL_PCONNECTS - log_error("PHP/MS SQL: Unable to reconnect!",php3_rqst->server); -#endif php3_error(E_WARNING,"MS SQL: Link to server lost, unable to reconnect"); _php3_hash_del(plist, hashed_details, hashed_details_length+1); efree(hashed_details); RETURN_FALSE; } -#if BROKEN_MSSQL_PCONNECTS - log_error("PHP/MS SQL: Reconnect successful!",php3_rqst->server); -#endif // if (dbsetopt(mssql_ptr->link,DBBUFFER,"2",-1)==FAIL) { if (dbsetopt(mssql_ptr->link,DBBUFFER,"2")==FAIL) { -#if BROKEN_MSSQL_PCONNECTS - log_error("PHP/MS SQL: 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