diff options
| -rw-r--r-- | ext/java/java.c | 8 | ||||
| -rw-r--r-- | ext/muscat/muscat.c | 4 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 8 | ||||
| -rw-r--r-- | sapi/apache2filter/php_functions.c | 5 |
4 files changed, 23 insertions, 2 deletions
diff --git a/ext/java/java.c b/ext/java/java.c index 0b32ee533e..1c29b79f85 100644 --- a/ext/java/java.c +++ b/ext/java/java.c @@ -480,6 +480,8 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe /***************************************************************************/ +/* {{{ proto object java_last_exception_get(void) + Get last Java exception */ PHP_FUNCTION(java_last_exception_get) { jlong result = 0; @@ -495,8 +497,12 @@ PHP_FUNCTION(java_last_exception_get) (*JG(jenv))->CallVoidMethod(JG(jenv), JG(php_reflect), lastEx, result); } +/* }}} */ + /***************************************************************************/ +/* {{{ proto void java_last_exception_clear(void) + Clear last java extension */ PHP_FUNCTION(java_last_exception_clear) { jlong result = 0; @@ -512,6 +518,8 @@ PHP_FUNCTION(java_last_exception_clear) (*JG(jenv))->CallVoidMethod(JG(jenv), JG(php_reflect), clearEx); } +/* }}} */ + /***************************************************************************/ static pval _java_getset_property diff --git a/ext/muscat/muscat.c b/ext/muscat/muscat.c index 5a5535eb1c..616e5468a5 100644 --- a/ext/muscat/muscat.c +++ b/ext/muscat/muscat.c @@ -158,7 +158,7 @@ void _discard(_muscat_handle * handle) { /* }}} */ -/* {{{ proto resource setup_muscat(int size [, string muscat_dir]) +/* {{{ proto resource muscat_setup(int size [, string muscat_dir]) Creates a new muscat session and returns the handle. Size is the ammount of memory in bytes to allocate for muscat muscat_dir is the muscat installation dir e.g. "/usr/local/empower", it defaults to the compile time muscat directory */ PHP_FUNCTION(muscat_setup) { @@ -200,7 +200,7 @@ PHP_FUNCTION(muscat_setup) } /* }}} */ -/* {{{ proto resource setup_muscat_net(string muscat_host, int port) +/* {{{ proto resource muscat_setup_net(string muscat_host, int port) Creates a new muscat session and returns the handle. muscat_host is the hostname to connect to port is the port number to connect to - actually takes exactly the same args as fsockopen */ PHP_FUNCTION(muscat_setup_net) { diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index 0b32ee533e..1c29b79f85 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -480,6 +480,8 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe /***************************************************************************/ +/* {{{ proto object java_last_exception_get(void) + Get last Java exception */ PHP_FUNCTION(java_last_exception_get) { jlong result = 0; @@ -495,8 +497,12 @@ PHP_FUNCTION(java_last_exception_get) (*JG(jenv))->CallVoidMethod(JG(jenv), JG(php_reflect), lastEx, result); } +/* }}} */ + /***************************************************************************/ +/* {{{ proto void java_last_exception_clear(void) + Clear last java extension */ PHP_FUNCTION(java_last_exception_clear) { jlong result = 0; @@ -512,6 +518,8 @@ PHP_FUNCTION(java_last_exception_clear) (*JG(jenv))->CallVoidMethod(JG(jenv), JG(php_reflect), clearEx); } +/* }}} */ + /***************************************************************************/ static pval _java_getset_property diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c index e03675c732..1cf72bff01 100644 --- a/sapi/apache2filter/php_functions.c +++ b/sapi/apache2filter/php_functions.c @@ -48,6 +48,8 @@ static request_rec *php_apache_lookup_uri(INTERNAL_FUNCTION_PARAMETERS) return ap_sub_req_lookup_uri(Z_STRVAL_PP(p1), ctx->f->r, NULL); } +/* {{{ proto bool apache_sub_req(string uri) + Perform an apache sub-request */ PHP_FUNCTION(apache_sub_req) { request_rec *rr; @@ -104,6 +106,8 @@ PHP_FUNCTION(apache_lookup_uri) RETURN_FALSE; } +/* {{{ proto array get_all_headers(void) + Fetch all HTTP request headers */ PHP_FUNCTION(get_all_headers) { php_struct *ctx; @@ -122,6 +126,7 @@ PHP_FUNCTION(get_all_headers) add_assoc_string(return_value, key, val, 1); APR_ARRAY_FOREACH_CLOSE() } +/* }}} */ PHP_MINFO_FUNCTION(apache) { |