projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
47c5257
)
- no global curlbuf anymore
author
Michael Wallner
<mike@php.net>
Wed, 13 Apr 2005 17:29:24 +0000
(17:29 +0000)
committer
Michael Wallner
<mike@php.net>
Wed, 13 Apr 2005 17:29:24 +0000
(17:29 +0000)
http.c
patch
|
blob
|
history
php_http.h
patch
|
blob
|
history
diff --git
a/http.c
b/http.c
index be06ac5aa002f0b43abdc0ceb11f64f75bbc98f0..0c6f5b63c8a92c6dab98a6a2048931c49b6dbf3f 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-143,15
+143,14
@@
static void free_to_free(void *s)
efree(*(char **)s);
}
efree(*(char **)s);
}
-/* {{{
php
_http_init_globals(zend_http_globals *) */
-static void
php
_http_init_globals(zend_http_globals *http_globals)
+/* {{{
void
_http_init_globals(zend_http_globals *) */
+static void _http_init_globals(zend_http_globals *http_globals)
{
http_globals->etag_started = 0;
http_globals->ctype = NULL;
http_globals->etag = NULL;
http_globals->lmod = 0;
#ifdef HTTP_HAVE_CURL
{
http_globals->etag_started = 0;
http_globals->ctype = NULL;
http_globals->etag = NULL;
http_globals->lmod = 0;
#ifdef HTTP_HAVE_CURL
- phpstr_init_ex(&http_globals->curlbuf, HTTP_CURLBUF_SIZE, 0);
# if LIBCURL_VERSION_NUM < 0x070c00
memset(&http_globals->curlerr, 0, sizeof(http_globals->curlerr));
# endif
# if LIBCURL_VERSION_NUM < 0x070c00
memset(&http_globals->curlerr, 0, sizeof(http_globals->curlerr));
# endif
@@
-223,7
+222,7
@@
static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); }
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
- ZEND_INIT_MODULE_GLOBALS(http,
php
_http_init_globals, NULL);
+ ZEND_INIT_MODULE_GLOBALS(http, _http_init_globals, NULL);
REGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
REGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
@@
-258,7
+257,6
@@
PHP_MSHUTDOWN_FUNCTION(http)
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
- phpstr_dtor(&HTTP_G(curlbuf));
curl_global_cleanup();
#endif
return SUCCESS;
curl_global_cleanup();
#endif
return SUCCESS;
@@
-294,7
+292,6
@@
PHP_RSHUTDOWN_FUNCTION(http)
# if LIBCURL_VERSION_NUM < 0x070c00
memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr)));
# endif
# if LIBCURL_VERSION_NUM < 0x070c00
memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr)));
# endif
- phpstr_dtor(&HTTP_G(curlbuf));
#endif
return SUCCESS;
#endif
return SUCCESS;
diff --git
a/php_http.h
b/php_http.h
index ca291374e2759e04f6efbc41a80fa53f5b2529dc..a0e7722218f33ff14c6c9dd2c1286ece1001714a 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-42,7
+42,6
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
time_t lmod;
char *allowed_methods;
#ifdef HTTP_HAVE_CURL
time_t lmod;
char *allowed_methods;
#ifdef HTTP_HAVE_CURL
- phpstr curlbuf;
# if LIBCURL_VERSION_NUM < 0x070c00
char curlerr[CURL_ERROR_SIZE + 1];
# endif
# if LIBCURL_VERSION_NUM < 0x070c00
char curlerr[CURL_ERROR_SIZE + 1];
# endif