Re: cvs: php-src /ext/mcve mcve.c php_mcve.h

Maybe it's time to move ext/mcve to PECL, where you can safely add new functions just before new PHP release? On Mon, 18 Jul 2005 20:10:09 -0000 "Brad House" <bradmssw@php.net> wrote: > bradmssw Mon Jul 18 16:10:09 2005 EDT > > Modified files: > /php-src/ext/mcve mcve.c php_mcve.h > Log: > sync missing functions from libmonetra-5 > > >{ÑšøA > J‡ÈÜÁá~‘http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.32&r2=1.33&ty=u > Index: php-src/ext/mcve/mcve.c > diff -u php-src/ext/mcve/mcve.c:1.32 php-src/ext/mcve/mcve.c:1.33 > --- php-src/ext/mcve/mcve.c:1.32 Thu Jun 30 10:11:11 2005 > +++ php-src/ext/mcve/mcve.c Mon Jul 18 16:10:06 2005 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: mcve.c,v 1.32 2005/06/30 14:11:11 sniper Exp $ */ > +/* $Id: mcve.c,v 1.33 2005/07/18 20:10:06 bradmssw Exp $ */ > > #ifdef HAVE_CONFIG_H > #include "config.h" > @@ -60,6 +60,10 @@ > PHP_FE(m_setdropfile, NULL) > PHP_FE(m_setip, NULL) > PHP_FE(m_setssl, NULL) > +#if LIBMONETRA_VERSION >= 050000 > + PHP_FE(m_setssl_cafile, NULL) > + PHP_FE(m_responsekeys, NULL) > +#endif > PHP_FE(m_setssl_files, NULL) > PHP_FE(m_settimeout, NULL) > PHP_FE(m_setblocking, NULL) > @@ -734,6 +738,31 @@ > } > /* }}} */ > > +#if LIBMONETRA_VERSION >= 050000 > +/* {{{ proto int m_setssl_cafile(resource conn, string cafile) > + Set SSL CA (Certificate Authority) file for verification of server > + certificate > +*/ > +PHP_FUNCTION(m_setssl_cafile) > +{ > + MCVE_CONN *conn; > + int retval; > + zval **arg1, **arg2; > + > + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) > + WRONG_PARAM_COUNT; > + > + > + ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection", le_conn); > + convert_to_string_ex(arg2); > + > + retval = M_SetSSL_CAfile(conn, Z_STRVAL_PP(arg2)); > + > + RETURN_LONG(retval); > +} > +/* }}} */ > +#endif > + > /* {{{ proto int m_setssl_files(resource conn, string sslkeyfile, string sslcertfile) > Set certificate key files and certificates if server requires client certificate > verification > @@ -1150,6 +1179,36 @@ > } > /* }}} */ > > +#if LIBMONETRA_VERSION >= 050000 > +/* {{{ proto array m_responsekeys(resource conn, long identifier) > + Returns array of strings which represents the keys that can be used > + for response parameters on this transaction > +*/ > +PHP_FUNCTION(m_responsekeys) > +{ > + MCVE_CONN *conn; > + char **retval; > + int num_keys, i; > + zval **arg1, **arg2; > + > + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) > + WRONG_PARAM_COUNT; > + > + ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection", le_conn); > + convert_to_long_ex(arg2); > + > + array_init(return_value); > + > + retval=M_ResponseKeys(conn, Z_LVAL_PP(arg2), &num_keys); > + if (retval != NULL) { > + for (i=0; i<num_keys; i++) > + add_next_index_string(return_value, retval[i], 1); > + M_FreeResponseKeys(retval, num_keys); > + } > +} > +/* }}} */ > +#endif > + > /* {{{ proto string m_getuserparam(resource conn, long identifier, int key) > Get a user response parameter */ > PHP_FUNCTION(m_getuserparam) > > http://cvs.php.net/diff.php/php-src/ext/mcve/php_mcve.h?r1=1.15&r2=1.16&ty=u > Index: php-src/ext/mcve/php_mcve.h > diff -u php-src/ext/mcve/php_mcve.h:1.15 php-src/ext/mcve/php_mcve.h:1.16 > --- php-src/ext/mcve/php_mcve.h:1.15 Mon Jun 6 12:43:23 2005 > +++ php-src/ext/mcve/php_mcve.h Mon Jul 18 16:10:06 2005 > @@ -16,7 +16,7 @@ > | Chris Faulhaber <jedgar@fxp.org> | > +----------------------------------------------------------------------+ > */ > -/* $Id: php_mcve.h,v 1.15 2005/06/06 16:43:23 bradmssw Exp $ */ > +/* $Id: php_mcve.h,v 1.16 2005/07/18 20:10:06 bradmssw Exp $ */ > > #ifndef _PHP_MCVE_H > #define _PHP_MCVE_H > @@ -51,6 +51,10 @@ > PHP_FUNCTION(m_setdropfile); > PHP_FUNCTION(m_setip); > PHP_FUNCTION(m_setssl); > +#if LIBMONETRA_VERSION >= 050000 > +PHP_FUNCTION(m_setssl_cafile); > +PHP_FUNCTION(m_responsekeys); > +#endif > PHP_FUNCTION(m_setssl_files); > PHP_FUNCTION(m_setblocking); > PHP_FUNCTION(m_settimeout); > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Wbr, Antony Dovgal