summary |
shortlog |
log |
commit | commitdiff |
tree |
github
raw |
patch |
inline | side by side (from parent 1:
ef227f4)
- there's no EGREP in WONKY's configure (?)
- only cache string request options
- CURLOPT_HTTPHEADER was lost
If you keep getting "SSL connect error" when trying to issue requests on
Windows, try another (newer) libeay32.dll/ssleay32.dll pair.
If you keep getting "SSL connect error" when trying to issue requests on
Windows, try another (newer) libeay32.dll/ssleay32.dll pair.
-Inflating compressed HttpRequest responses happens twice if libcurl
-was built with zlib support.
-
Internals:
- there's a memleak with sizeof(zval) for each thrown exception,
which ends up in HttpRequestPoolExcepiont::$exceptionStack, in
Internals:
- there's a memleak with sizeof(zval) for each thrown exception,
which ends up in HttpRequestPoolExcepiont::$exceptionStack, in
if test "$PHP_HTTP" != "no"; then
if test "$PHP_HTTP" != "no"; then
+ ifdef([AC_PROG_EGREP], [
+ AC_PROG_EGREP
+ ], [
+ AC_CHECK_PROG(EGREP, egrep, egrep)
+ ])
ifdef([AC_PROG_SED], [
AC_PROG_SED
], [
ifdef([AC_PROG_SED], [
AC_PROG_SED
], [
CURL_LIBS=`$CURL_CONFIG --libs`
CURL_LIBS=`$CURL_CONFIG --libs`
- CURL_ZLIB=`$CURL_CONFIG --features | $EGREP libz`
- if test "$CURL_ZLIB" = "libz"; then
- AC_DEFINE([HTTP_HAVE_CURL_ZLIB], [1], [ ])
- fi
-
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
if test "$CURL_SSL" = "SSL"; then
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
if test "$CURL_SSL" = "SSL"; then
CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
CHECK_LIB("zlib.lib", "http", PHP_HTTP) &&
CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {
AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library");
- AC_DEFINE("HTTP_HAVE_CURL_ZLIB", 1, "");
AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
HTTP_CURL_OPT(PORT, 0);
HTTP_CURL_OPT(USERPWD, NULL);
HTTP_CURL_OPT(HTTPAUTH, 0);
HTTP_CURL_OPT(PORT, 0);
HTTP_CURL_OPT(USERPWD, NULL);
HTTP_CURL_OPT(HTTPAUTH, 0);
- HTTP_CURL_OPT(ENCODING, 0);
+ HTTP_CURL_OPT(ENCODING, NULL);
HTTP_CURL_OPT(FOLLOWLOCATION, 0);
HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0);
HTTP_CURL_OPT(REFERER, NULL);
HTTP_CURL_OPT(FOLLOWLOCATION, 0);
HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0);
HTTP_CURL_OPT(REFERER, NULL);
HTTP_CURL_OPT(IOCTLDATA, NULL);
HTTP_CURL_OPT(READDATA, NULL);
HTTP_CURL_OPT(INFILESIZE, 0);
HTTP_CURL_OPT(IOCTLDATA, NULL);
HTTP_CURL_OPT(READDATA, NULL);
HTTP_CURL_OPT(INFILESIZE, 0);
-#if 0
- HTTP_CURL_OPT(IGNORE_CONTENT_ENCODING, 1);
-#endif
HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
}
HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
}
- /* compress, empty string enables all supported if libcurl was build with zlib support */
- if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-#ifdef HTTP_HAVE_CURL_ZLIB
- HTTP_CURL_OPT(ENCODING, "gzip, deflate");
-#else
- HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
-#endif
- }
-
/* redirects, defaults to 0 */
if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) {
HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
/* redirects, defaults to 0 */
if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) {
HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
}
/* additional headers, array('name' => 'value') */
}
/* additional headers, array('name' => 'value') */
+ if (request->_cache.headers) {
+ curl_slist_free_all(request->_cache.headers);
+ request->_cache.headers = NULL;
+ }
if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) {
char *header_key;
ulong header_idx;
HashPosition pos;
if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) {
char *header_key;
ulong header_idx;
HashPosition pos;
- if (request->_cache.headers) {
- curl_slist_free_all(request->_cache.headers);
- request->_cache.headers = NULL;
- }
-
FOREACH_KEY(pos, zoption, header_key, header_idx) {
if (header_key) {
zval **header_val;
FOREACH_KEY(pos, zoption, header_key, header_idx) {
if (header_key) {
zval **header_val;
+ if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
+ request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5,*;q=0.1");
+ }
+ HTTP_CURL_OPT(HTTPHEADER, request->_cache.headers);
/* cookies, array('name' => 'value') */
if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
/* cookies, array('name' => 'value') */
if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
+ /* cache strings */
+ if (type == IS_STRING) {
+ ZVAL_ADDREF(*zoption);
- _zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, zoption, sizeof(zval *), NULL,
- zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC);
+ _zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, zoption, sizeof(zval *), NULL,
+ zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC);
- zend_hash_add_or_update(&r->_cache.options, key, keylen, zoption, sizeof(zval *), NULL,
- zend_hash_exists(&r->_cache.options, key, keylen)?HASH_UPDATE:HASH_ADD);
+ zend_hash_add_or_update(&r->_cache.options, key, keylen, zoption, sizeof(zval *), NULL,
+ zend_hash_exists(&r->_cache.options, key, keylen)?HASH_UPDATE:HASH_ADD);
/>
<filelist>
<install as="functions.html" name="docs/functions.html"/>
/>
<filelist>
<install as="functions.html" name="docs/functions.html"/>
+ <install as="examples/extract.php" name="docs/examples/extract.php"/>
+ <install as="examples/tutorial.txt" name="docs/examples/tutorial.txt"/>
</filelist>
</extsrcrelease>
<changelog />
</filelist>
</extsrcrelease>
<changelog />