projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix log ini entries in docs
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 4b5aaa557fffa24f9965d2ff86f79f4a6b55e146..09010f8e1685dfc940cbab433308b7e7662958ba 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-15,7
+15,7
@@
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "
0.24.0dev
"
+#define PHP_EXT_HTTP_VERSION "
1.0.0RC5
"
#ifdef HAVE_CONFIG_H
# include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@
-33,9
+33,7
@@
#ifdef HTTP_WANT_SAPI
# if PHP_API_VERSION > 20041225
# define HTTP_HAVE_SAPI_RTIME
#ifdef HTTP_WANT_SAPI
# if PHP_API_VERSION > 20041225
# define HTTP_HAVE_SAPI_RTIME
-# define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
# else
# else
-# define HTTP_GET_REQUEST_TIME() HTTP_G->request_time
# endif
# include "SAPI.h"
#endif
# endif
# include "SAPI.h"
#endif
@@
-59,6
+57,7
@@
# define CURL_STATICLIB
# endif
# include <curl/curl.h>
# define CURL_STATICLIB
# endif
# include <curl/curl.h>
+# define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
#endif
#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
#endif
#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
@@
-114,18
+113,17
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
} send;
struct _http_globals_request {
} send;
struct _http_globals_request {
+ time_t time;
struct _http_globals_request_methods {
char *allowed;
struct _http_globals_request_methods_custom {
struct _http_globals_request_methods {
char *allowed;
struct _http_globals_request_methods_custom {
+ char *ini;
int count;
void *entries;
} custom;
} methods;
} request;
int count;
void *entries;
} custom;
} methods;
} request;
-#ifndef HTTP_HAVE_SAPI_RTIME
- time_t request_time;
-#endif
#ifdef ZEND_ENGINE_2
zend_bool only_exceptions;
#endif
#ifdef ZEND_ENGINE_2
zend_bool only_exceptions;
#endif
@@
-168,6
+166,7
@@
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_parse_message);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_parse_cookie);
PHP_FUNCTION(http_parse_message);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_parse_cookie);
+PHP_FUNCTION(http_parse_params);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_get_request_body);
PHP_FUNCTION(http_get_request_body_stream);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_get_request_body);
PHP_FUNCTION(http_get_request_body_stream);
@@
-177,8
+176,11
@@
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_post_fields);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_post_fields);
+PHP_FUNCTION(http_put_data);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
+PHP_FUNCTION(http_request);
+PHP_FUNCTION(http_request_body_encode);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);
@@
-193,12
+195,6
@@
PHP_FUNCTION(ob_inflatehandler);
#endif
PHP_FUNCTION(http_support);
#endif
PHP_FUNCTION(http_support);
-PHP_MINIT_FUNCTION(http);
-PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
-PHP_RSHUTDOWN_FUNCTION(http);
-PHP_MINFO_FUNCTION(http);
-
#endif /* PHP_HTTP_H */
/*
#endif /* PHP_HTTP_H */
/*