[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com =?UTF-8?Q?pecl/database/ibm=5Fdb=32=3A=20Updated=20php=5Fibm=5Fdb=32?= =?UTF-8?Q?=2Eh
From:       venkatesh babu ks <vnkbabu () php ! net>
Date:       2019-04-25 8:49:36
Message-ID: php-mail-dfdc01d1a1d6d89c64c66f731e5a0653365348716 () git ! php ! net
[Download RAW message or body]

Commit:    7290e4600fc507b7c5f2bc1a4f0fabbba55238ed
Author:    Abhinav Radke <aradke@rocketsoftware.com>         Thu, 25 Apr 2019 \
                14:19:36 +0530
Parents:   f3eb8d2a6c30c415c917722055e2babd9a3c820c
Branches:  master

Link:       http://git.php.net/?p=pecl/database/ibm_db2.git;a=commitdiff;h=7290e4600fc507b7c5f2bc1a4f0fabbba55238ed


Log:
Updated php_ibm_db2.h file

Changed paths:
  M  ibm_db2.c
  M  php_ibm_db2.h


Diff:
diff --git a/ibm_db2.c b/ibm_db2.c
index b652e81..fb0c820 100644
--- a/ibm_db2.c
+++ b/ibm_db2.c
@@ -3114,7 +3114,7 @@ PHP_FUNCTION(db2_autocommit)
         return;
     }
 
-        if (connection) {
+    if (connection) {
         ZEND_FETCH_RESOURCE_2(conn_res, conn_handle*, &connection, connection_id,
             "Connection Resource", le_conn_struct, le_pconn_struct);
 
diff --git a/php_ibm_db2.h b/php_ibm_db2.h
index 57d13cf..b6e3fe0 100644
--- a/php_ibm_db2.h
+++ b/php_ibm_db2.h
@@ -23,7 +23,7 @@
   $Id$
 */
 
-#define	PHP_IBM_DB2_VERSION	"2.0.4"
+#define	PHP_IBM_DB2_VERSION	"2.0.8"
 
 #ifndef PHP_IBM_DB2_H
 #define PHP_IBM_DB2_H
@@ -388,6 +388,30 @@ PHP_FUNCTION(db2_last_insert_id);
 	Declare any global variables you may need between the BEGIN
 	and END macros here:
 */
+#if PHP_MAJOR_VERSION >= 7
+ZEND_BEGIN_MODULE_GLOBALS(ibm_db2)
+	zend_long		bin_mode;
+	char		__php_conn_err_msg[DB2_MAX_ERR_MSG_LEN];
+	char		__php_conn_err_state[SQL_SQLSTATE_SIZE + 1];
+	char		__php_stmt_err_msg[DB2_MAX_ERR_MSG_LEN];
+	char		__php_stmt_err_state[SQL_SQLSTATE_SIZE + 1];
+	zend_long		i5_allow_commit;	/* orig  - IBM i legacy CRTLIB containers fail under \
commit control (isolation *NONE) */ +	zend_long		i5_sys_naming;		/* 1.9.7 - IBM i + \
LUW DB2 Connect 10.5 system naming (customer *LIBL issues) */ +#ifdef PASE /* IBM i \
ibm_db2.ini options */ +	zend_long		i5_dbcs_alloc;		/* orig  - IBM i 6x space for \
CCSID<>UTF-8 convert  (DBCS customer issue) */ +	zend_long		i5_all_pconnect;	/* orig  \
- IBM i force all connect to pconnect (operator issue) */ \
+	zend_long		i5_ignore_userid;	/* orig  - IBM i ignore user id enables no-QSQSRVR job \
(custom site request) */ +	zend_long		i5_job_sort;		/* orig  - IBM i \
SQL_ATTR_JOB_SORT_SEQUENCE (customer request DB2 PTF) */ \
+	zend_long		i5_override_ccsid;	/* 1.9.7 - IBM i force UTF-8 CCSID (DBCS customer \
issue) */ +	zend_long		i5_blank_userid;	/* 1.9.7 - IBM i security restrict blank \
db,uid,pwd (unless customer allow flag) */ +	zend_long		i5_log_verbose;		/* 1.9.7 - \
IBM i consultant request log additional information into php.log */ \
+	zend_long		i5_max_pconnect;	/* 1.9.7 - IBM i count max usage connection recycle \
(customer issue months live connection) */ +	zend_long		i5_check_pconnect;	/* 1.9.7 - \
IBM i remote persistent connection or long lived local (customer issue dead \
connection) */ +	char		        *i5_servermode_subsystem; /* 1.9.7 - IBM i consultant \
request switch subsystem QSQSRVR job (customer workload issues) */ \
+	zend_long		i5_guard_profile;	/* 1.9.7 - IBM i monitor switch user profile \
applications (customer security issue) */ +#endif /* PASE */
+ZEND_END_MODULE_GLOBALS(ibm_db2)
+#else
 ZEND_BEGIN_MODULE_GLOBALS(ibm_db2)
 	long		bin_mode;
 	char		__php_conn_err_msg[DB2_MAX_ERR_MSG_LEN];
@@ -410,6 +434,7 @@ ZEND_BEGIN_MODULE_GLOBALS(ibm_db2)
 	long		i5_guard_profile;	/* 1.9.7 - IBM i monitor switch user profile applications \
(customer security issue) */  #endif /* PASE */
 ZEND_END_MODULE_GLOBALS(ibm_db2)
+#endif
 
 /* In every utility function you add that needs to use variables
    in php_ibm_db2_globals, call TSRMLS_FETCH(); after declaring other


--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]