CVS update: php3/functions

Date: Wednesday June 2, 1999 @ 3:48 Author: thies Update of /repository/php3/functions In directory php:/tmp/cvs-serv2075/functions Modified Files: oracle.c Log Message: added define to switch from olog to orlon call (needed for very old oracle-client libs) Index: php3/functions/oracle.c diff -u php3/functions/oracle.c:1.108 php3/functions/oracle.c:1.109 --- php3/functions/oracle.c:1.108 Tue Jun 1 04:11:04 1999 +++ php3/functions/oracle.c Wed Jun 2 03:48:56 1999 @@ -30,6 +30,12 @@ | Thies C. Arntzen <thies@digicol.de> | +----------------------------------------------------------------------+ */ + +/* comment out the next line if you're on Oracle 7.x and don't have the olog + call. */ + +#define HAS_OLOG 1 + #if defined(COMPILE_DL) # if PHP_31 # include "../phpdl.h" @@ -490,8 +496,13 @@ memset((void *) db_conn,0,sizeof(oraConnection)); +#if HAS_OLOG if (olog(&db_conn->lda, db_conn->hda, user, strlen(user), pwd, strlen(pwd), 0, -1, OCI_LM_DEF)) { +#else + if (orlon(&db_conn->lda, db_conn->hda, user, + strlen(user), pwd, strlen(pwd), 0)) { +#endif php3_error(E_WARNING, "Unable to connect to ORACLE (%s)", ora_error(&db_conn->lda)); if (persistent) @@ -551,8 +562,13 @@ type == ORACLE_GLOBAL(php3_oracle_module).le_pconn)){ if(!_ora_ping(db_conn)) { /* XXX Reinitialize lda, hda ? */ +#if HAS_OLOG if(olog(&db_conn->lda, db_conn->hda, user, strlen(user), pwd, strlen(pwd), 0, -1, OCI_LM_DEF)) { +#else + if(orlon(&db_conn->lda, db_conn->hda, user, + strlen(user), pwd, strlen(pwd), 0)) { +#endif php3_error(E_WARNING, "Unable to reconnect to ORACLE (%s)", ora_error(&db_conn->lda)); /* Delete list entry for this connection */ @@ -1877,6 +1893,7 @@ strncpy(param->progv, pdata->value.str.val, len); param->progv[len] = '\0'; + efree(paramname); } return 1;