projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- config.m4 moved to config9.m4
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 32ce1e365123d6af1f8a15943a52130c7f654a2c..08b2a4db4009ae7b908fa5bf4552c48e13ee8420 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 "1.0.0
RC3
-dev"
+#define PHP_EXT_HTTP_VERSION "1.0.0-dev"
#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
@@
-91,6
+89,7
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
struct _http_globals_log {
char *cache;
char *redirect;
struct _http_globals_log {
char *cache;
char *redirect;
+ char *not_found;
char *allowed_methods;
char *composite;
} log;
char *allowed_methods;
char *composite;
} log;
@@
-112,21
+111,21
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
long start_flags;
void *stream;
} inflate;
long start_flags;
void *stream;
} inflate;
+ zend_bool not_found_404;
} 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
@@
-145,6
+144,8
@@
ZEND_EXTERN_MODULE_GLOBALS(http);
# define HTTP_G (&http_globals)
#endif
# define HTTP_G (&http_globals)
#endif
+#define HTTP_HAVE_EXT(EXT) ((defined(HAVE_##EXT) || defined(HAVE_PHP_##EXT)) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_##EXT)))
+
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_build_url);
PHP_FUNCTION(http_test);
PHP_FUNCTION(http_date);
PHP_FUNCTION(http_build_url);
@@
-169,6
+170,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);
@@
-181,6
+183,10
@@
PHP_FUNCTION(http_post_fields);
PHP_FUNCTION(http_put_data);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
PHP_FUNCTION(http_put_data);
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
+PHP_FUNCTION(http_request);
+#ifdef HAVE_CURL_GETFORMDATA
+PHP_FUNCTION(http_request_body_encode);
+#endif /* HAVE_CURL_GETFORMDATA */
#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);