com php-src: Remove obsolete flag: ext/oci8/oci8.c ext/oci8/o ci8_interface.c ext/oci8/php_oci8_int.h ext /oci8/tests/function_aliases.phpt

Commit: 43289d664ccde3813c10c745687a7674067f9856 Author: Christopher Jones <sixd@php.net> Fri, 6 Sep 2013 10:12:16 -0700 Parents: ca4d122adcab8703f63cf8ed95a28a1fbc6e2b47 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43289d664ccde3813c10c745687a7674067f9856 Log: Remove obsolete flag Changed paths: M ext/oci8/oci8.c M ext/oci8/oci8_interface.c M ext/oci8/php_oci8_int.h M ext/oci8/tests/function_aliases.phpt Diff: diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 8b6a389..bccaa52 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -1306,7 +1306,6 @@ PHP_MINIT_FUNCTION(oci) PHP_RINIT_FUNCTION(oci) { - OCI_G(debug_mode) = 0; /* start "fresh" */ OCI_G(num_links) = OCI_G(num_persistent); OCI_G(errcode) = 0; OCI_G(edition) = NULL; diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index 6042ca5..8d70aff 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -1308,12 +1308,7 @@ PHP_FUNCTION(oci_field_is_null) Toggle internal debugging output for the OCI extension */ PHP_FUNCTION(oci_internal_debug) { - zend_bool on_off; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &on_off) == FAILURE) { - return; - } - OCI_G(debug_mode) = on_off; + /* NOP in OCI8 2.0. Obsoleted by DTrace probes */ } /* }}} */ diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 7c84858..6155a88 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -496,8 +496,6 @@ ZEND_BEGIN_MODULE_GLOBALS(oci) /* {{{ Module globals */ sb4 errcode; /* global last ORA- error number. Used when connect fails, for example */ OCIError *err; /* global error handle */ - zend_bool debug_mode; /* debug mode flag */ - long max_persistent; /* maximum number of persistent connections per process */ long num_persistent; /* number of existing persistent connections */ long num_links; /* non-persistent + persistent connections */ diff --git a/ext/oci8/tests/function_aliases.phpt b/ext/oci8/tests/function_aliases.phpt index 4c6ce83..2c890d6 100644 --- a/ext/oci8/tests/function_aliases.phpt +++ b/ext/oci8/tests/function_aliases.phpt @@ -104,8 +104,6 @@ NULL Warning: ocifreestatement() expects exactly 1 parameter, 0 given in %s on line %d NULL - -Warning: ociinternaldebug() expects exactly 1 parameter, 0 given in %s on line %d NULL Warning: ocinumcols() expects exactly 1 parameter, 0 given in %s on line %d