diff options
| author | STANLEY SUFFICOOL <ssufficool@php.net> | 2014-10-22 23:14:23 -0700 |
|---|---|---|
| committer | STANLEY SUFFICOOL <ssufficool@php.net> | 2014-10-22 23:14:23 -0700 |
| commit | 0282546111ac942257f453d2882e6f616297fa11 (patch) | |
| tree | 38f6de5d9641bac91df1002e7ab42a012d9070fc /ext/pdo_dblib/pdo_dblib.c | |
| parent | 5ba114e0a6828cb49a46ce79d388c23e4c018b7a (diff) | |
| download | php-git-0282546111ac942257f453d2882e6f616297fa11.tar.gz | |
Implement Bug #66063 - pdo_dblib enable timeout parameter
Diffstat (limited to 'ext/pdo_dblib/pdo_dblib.c')
| -rw-r--r-- | ext/pdo_dblib/pdo_dblib.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c index 3afd885df5..4cd0749cf8 100644 --- a/ext/pdo_dblib/pdo_dblib.c +++ b/ext/pdo_dblib/pdo_dblib.c @@ -86,7 +86,7 @@ ZEND_GET_MODULE(pdo_dblib) #endif #endif -int error_handler(DBPROCESS *dbproc, int severity, int dberr, +int pdo_dblib_error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) { pdo_dblib_err *einfo; @@ -103,6 +103,7 @@ int error_handler(DBPROCESS *dbproc, int severity, int dberr, einfo->severity = severity; einfo->oserr = oserr; einfo->dberr = dberr; + if (einfo->oserrstr) { efree(einfo->oserrstr); } @@ -128,16 +129,10 @@ int error_handler(DBPROCESS *dbproc, int severity, int dberr, } strcpy(einfo->sqlstate, state); -#if 0 - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "dblib error: %d %s (severity %d)", - dberr, dberrstr, severity); -#endif - return INT_CANCEL; } -int msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, +int pdo_dblib_msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severity, char *msgtext, char *srvname, char *procname, DBUSMALLINT line) { pdo_dblib_err *einfo; @@ -156,10 +151,6 @@ int msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, einfo->lastmsg = estrdup(msgtext); } -#if 0 - php_error_docref(NULL TSRMLS_CC, E_WARNING, "dblib message: %s (severity %d)", msgtext, severity); -#endif - return 0; } @@ -196,18 +187,9 @@ PHP_MINIT_FUNCTION(pdo_dblib) return FAILURE; } - /* TODO: - - dbsetifile() - dbsetmaxprocs() - dbsetlogintime() - dbsettime() - - */ - #if !PHP_DBLIB_IS_MSSQL - dberrhandle(error_handler); - dbmsghandle(msg_handler); + dberrhandle((EHANDLEFUNC) pdo_dblib_error_handler); + dbmsghandle((MHANDLEFUNC) pdo_dblib_msg_handler); #endif return SUCCESS; |