X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=2c849c1215c7e1a2d9ea1b35432bed108960a6c9;hp=791aa1e6d0d6d9fe68ea3dbce2792576f84a5da6;hb=ebecc38999eaa447a92ec526fc510965223d6f02;hpb=aca5a5a21e4514707a71cfa69cc19ae50a78f5d3 diff --git a/http_functions.c b/http_functions.c index 791aa1e..2c849c1 100644 --- a/http_functions.c +++ b/http_functions.c @@ -229,7 +229,7 @@ PHP_FUNCTION(http_negotiate_charset) } /* }}} */ -/* {{{ proto string http_negotiate_ctype(array supported[, array &result]) +/* {{{ proto string http_negotiate_content_type(array supported[, array &result]) Negotiate the clients preferred content type. */ PHP_FUNCTION(http_negotiate_content_type) { @@ -802,10 +802,6 @@ PHP_FUNCTION(http_match_request_header) } /* }}} */ -/* {{{ HAVE_CURL */ -#ifdef HTTP_HAVE_CURL -#ifdef HTTP_HAVE_PERSISTENT_HANDLES - /* {{{ proto object http_persistent_handles_count() */ PHP_FUNCTION(http_persistent_handles_count) { @@ -830,7 +826,7 @@ PHP_FUNCTION(http_persistent_handles_clean) } /* }}} */ -/* {{{ proto string http_persistent_handles_ident(string ident) */ +/* {{{ proto string http_persistent_handles_ident([string ident]) */ PHP_FUNCTION(http_persistent_handles_ident) { char *ident_str = NULL; @@ -845,7 +841,8 @@ PHP_FUNCTION(http_persistent_handles_ident) } /* }}} */ -#endif /* HTTP_HAVE_PERSISTENT_HANDLES */ +/* {{{ HAVE_CURL */ +#ifdef HTTP_HAVE_CURL #define RETVAL_RESPONSE_OR_BODY(request) \ { \