From: Michael Wallner <mike@php.net>
Date: Fri, 29 May 2015 07:44:10 +0000 (+0200)
Subject: Merge branch 'feature/cursor-async' of https://github.com/DaveRandom/pecl-database-pq
X-Git-Tag: v0.6.0RC1~7
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=commitdiff_plain;h=10e7d6adccdd55554f1512de5e829a75aef62461

Merge branch 'feature/cursor-async' of https://github.com/DaveRandom/pecl-database-pq
---

10e7d6adccdd55554f1512de5e829a75aef62461
diff --cc src/php_pqcur.c
index fc5be1d,7680880..a84041e
--- a/src/php_pqcur.c
+++ b/src/php_pqcur.c
@@@ -237,9 -318,23 +318,23 @@@ static PHP_METHOD(pqcur, __construct) 
  ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_open, 0, 0, 0)
  ZEND_END_ARG_INFO();
  static PHP_METHOD(pqcur, open)
+ {
+ 	cur_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+ }
+ 
+ ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_openAsync, 0, 0, 0)
+ ZEND_END_ARG_INFO();
+ static PHP_METHOD(pqcur, openAsync)
+ {
+ 	cur_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+ }
+ 
+ ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_close, 0, 0, 0)
+ ZEND_END_ARG_INFO();
+ static PHP_METHOD(pqcur, close)
  {
  	zend_error_handling zeh;
 -	STATUS rv;
 +	ZEND_RESULT_CODE rv;
  
  	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
  	rv = zend_parse_parameters_none();
@@@ -258,12 -351,12 +351,12 @@@
  	}
  }
  
- ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_close, 0, 0, 0)
+ ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_closeAsync, 0, 0, 0)
  ZEND_END_ARG_INFO();
- static PHP_METHOD(pqcur, close)
+ static PHP_METHOD(pqcur, closeAsync)
  {
  	zend_error_handling zeh;
 -	STATUS rv;
 +	ZEND_RESULT_CODE rv;
  
  	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
  	rv = zend_parse_parameters_none();