projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'RELEASE_1_5_3'.
[m6w6/ext-http]
/
http_functions.c
diff --git
a/http_functions.c
b/http_functions.c
index 791aa1e6d0d6d9fe68ea3dbce2792576f84a5da6..2c849c1215c7e1a2d9ea1b35432bed108960a6c9 100644
(file)
--- 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_c
ontent_
type(array supported[, array &result])
Negotiate the clients preferred content type. */
PHP_FUNCTION(http_negotiate_content_type)
{
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)
{
/* {{{ 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;
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) \
{ \
#define RETVAL_RESPONSE_OR_BODY(request) \
{ \