projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- make this class usable, mostly by fixing typos
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 3def97fdccc0102109e21faec0d63119338bda0b..7244c85c5dd3199303baadd30191d2bb6f0f0c0e 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-15,18
+15,41
@@
#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.21.0dev"
+#define PHP_EXT_HTTP_VERSION "1.0.0RC2-dev"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# ifndef PHP_WIN32
+# include "php_config.h"
+# endif
+#endif
#include "php.h"
#include "php_http_std_defs.h"
#include "phpstr/phpstr.h"
#include "missing.h"
#include "php.h"
#include "php_http_std_defs.h"
#include "phpstr/phpstr.h"
#include "missing.h"
+#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
+# define HTTP_GET_REQUEST_TIME() HTTP_G->request_time
+# endif
+# include "SAPI.h"
+#endif
+
#ifdef HTTP_WANT_NETDB
# ifdef PHP_WIN32
#ifdef HTTP_WANT_NETDB
# ifdef PHP_WIN32
+# define HTTP_HAVE_NETDB
# include <winsock2.h>
# elif defined(HAVE_NETDB_H)
# include <winsock2.h>
# elif defined(HAVE_NETDB_H)
+# define HTTP_HAVE_NETDB
# include <netdb.h>
# include <netdb.h>
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
# endif
#endif
# endif
#endif
@@
-36,6
+59,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)
@@
-93,18
+117,22
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
struct _http_globals_request {
struct _http_globals_request_methods {
char *allowed;
struct _http_globals_request {
struct _http_globals_request_methods {
char *allowed;
- struct {
+ struct
_http_globals_request_methods_custom
{
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
zend_bool force_exit;
#ifdef ZEND_ENGINE_2
zend_bool only_exceptions;
#endif
zend_bool force_exit;
+ zend_bool read_post_data;
ZEND_END_MODULE_GLOBALS(http)
ZEND_END_MODULE_GLOBALS(http)
@@
-112,17
+140,15
@@
ZEND_EXTERN_MODULE_GLOBALS(http);
#ifdef ZTS
# include "TSRM.h"
#ifdef ZTS
# include "TSRM.h"
-# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
-# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
+# define HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
#else
#else
-# define HTTP_G(v) (http_globals.v)
-# define HTTP_GLOBALS (&http_globals)
+# define HTTP_G (&http_globals)
#endif
#endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
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);
+PHP_FUNCTION(http_build_str);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_negotiate_content_type);
PHP_FUNCTION(http_negotiate_language);
PHP_FUNCTION(http_negotiate_charset);
PHP_FUNCTION(http_negotiate_content_type);
@@
-145,12
+171,14
@@
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_parse_cookie);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_get_request_body);
PHP_FUNCTION(http_parse_cookie);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_get_request_body);
+PHP_FUNCTION(http_get_request_body_stream);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_head);
PHP_FUNCTION(http_post_data);
PHP_FUNCTION(http_post_fields);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
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);
#endif /* HTTP_HAVE_CURL */
PHP_FUNCTION(http_put_file);
PHP_FUNCTION(http_put_stream);
#endif /* HTTP_HAVE_CURL */
@@
-158,9
+186,6
@@
PHP_FUNCTION(http_request_method_register);
PHP_FUNCTION(http_request_method_unregister);
PHP_FUNCTION(http_request_method_exists);
PHP_FUNCTION(http_request_method_name);
PHP_FUNCTION(http_request_method_unregister);
PHP_FUNCTION(http_request_method_exists);
PHP_FUNCTION(http_request_method_name);
-#ifndef ZEND_ENGINE_2
-PHP_FUNCTION(http_build_query);
-#endif /* ZEND_ENGINE_2 */
PHP_FUNCTION(ob_etaghandler);
#ifdef HTTP_HAVE_ZLIB
PHP_FUNCTION(http_deflate);
PHP_FUNCTION(ob_etaghandler);
#ifdef HTTP_HAVE_ZLIB
PHP_FUNCTION(http_deflate);
@@
-170,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 */
/*