- add possibility to reset session cookies only, patch to libcurl has been accepted (7.15.4)
<h3 id="HttpRequest_enableCookies">bool HttpRequest::enableCookies()</h3>
<p>Enable automatic sending of received cookies.<br />
Note that cuutomly set cookies will be sent anyway.</p>
<h3 id="HttpRequest_enableCookies">bool HttpRequest::enableCookies()</h3>
<p>Enable automatic sending of received cookies.<br />
Note that cuutomly set cookies will be sent anyway.</p>
-<h3 id="HttpRequest_resetCookies">bool HttpRequest::resetCookies()</h3>
+<h3 id="HttpRequest_resetCookies">bool HttpRequest::resetCookies([bool session_only = FALSE])</h3>
<p>Reset all automatically received/sent cookies.<br />
Note that customly set cookies are not affected.</p>
<p>Reset all automatically received/sent cookies.<br />
Note that customly set cookies are not affected.</p>
+<p>Accepts an optional bool parameter specifying<br />
+whether only session cookies should be reset<br />
+(needs libcurl >= v7.15.4, else libcurl >= v7.14.1).</p>
+<p>Returns TRUE on success, or FALSE on failure.</p>
<h3 id="HttpRequest_setUrl">bool HttpRequest::setUrl(string url)</h3>
<p>Set the request URL.</p>
<p>Expects a string as parameter specifying the request url.</p>
<h3 id="HttpRequest_setUrl">bool HttpRequest::setUrl(string url)</h3>
<p>Set the request URL.</p>
<p>Expects a string as parameter specifying the request url.</p>
- <p><b>Generated at: Mon, 22 May 2006 11:19:25 +0200</b></p>
+ <p><b>Generated at: Thu, 25 May 2006 10:46:03 +0200</b></p>
{
if (ch || (ch = curl_easy_init())) {
#if defined(ZTS)
{
if (ch || (ch = curl_easy_init())) {
#if defined(ZTS)
- HTTP_CURL_OPT_EX(ch, CURLOPT_NOSIGNAL, 1);
+ HTTP_CURL_OPT_EX(ch, CURLOPT_NOSIGNAL, 1L);
- HTTP_CURL_OPT_EX(ch, CURLOPT_HEADER, 0);
- HTTP_CURL_OPT_EX(ch, CURLOPT_FILETIME, 1);
- HTTP_CURL_OPT_EX(ch, CURLOPT_AUTOREFERER, 1);
- HTTP_CURL_OPT_EX(ch, CURLOPT_VERBOSE, 1);
+ HTTP_CURL_OPT_EX(ch, CURLOPT_HEADER, 0L);
+ HTTP_CURL_OPT_EX(ch, CURLOPT_FILETIME, 1L);
+ HTTP_CURL_OPT_EX(ch, CURLOPT_AUTOREFERER, 1L);
+ HTTP_CURL_OPT_EX(ch, CURLOPT_VERBOSE, 1L);
HTTP_CURL_OPT_EX(ch, CURLOPT_HEADERFUNCTION, NULL);
HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback);
HTTP_CURL_OPT_EX(ch, CURLOPT_READFUNCTION, http_curl_read_callback);
HTTP_CURL_OPT_EX(ch, CURLOPT_HEADERFUNCTION, NULL);
HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback);
HTTP_CURL_OPT_EX(ch, CURLOPT_READFUNCTION, http_curl_read_callback);
{
if (*ch) {
/* avoid nasty segfaults with already cleaned up callbacks */
{
if (*ch) {
/* avoid nasty segfaults with already cleaned up callbacks */
- HTTP_CURL_OPT_EX(*ch, CURLOPT_NOPROGRESS, 1);
+ HTTP_CURL_OPT_EX(*ch, CURLOPT_NOPROGRESS, 1L);
HTTP_CURL_OPT_EX(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
HTTP_CURL_OPT_EX(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
- HTTP_CURL_OPT_EX(*ch, CURLOPT_VERBOSE, 0);
+ HTTP_CURL_OPT_EX(*ch, CURLOPT_VERBOSE, 0L);
HTTP_CURL_OPT_EX(*ch, CURLOPT_DEBUGFUNCTION, NULL);
curl_easy_cleanup(*ch);
*ch = NULL;
HTTP_CURL_OPT_EX(*ch, CURLOPT_DEBUGFUNCTION, NULL);
curl_easy_cleanup(*ch);
*ch = NULL;
-/* {{{ STATUS http_request_reset_cookies(http_request *) */
-PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request)
+/* {{{ STATUS http_request_reset_cookies(http_request *, int) */
+PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int session_only)
{
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
{
TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+
+ if (session_only) {
+#if HTTP_CURL_VERSION(7,15,4)
+ curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "SESS");
+ return SUCCESS;
+#else
+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset session cookies (need libcurl >= v7.15.4)");
+#endif
+ } else {
#if HTTP_CURL_VERSION(7,14,1)
#if HTTP_CURL_VERSION(7,14,1)
- if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL")) {
+ curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL");
+#else
+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies (need libcurl >= v7.14.1)");
- http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies");
return FAILURE;
}
/* }}} */
return FAILURE;
}
/* }}} */
if (request->ch) {
HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, NULL);
HTTP_CURL_OPT(CURLOPT_URL, NULL);
if (request->ch) {
HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, NULL);
HTTP_CURL_OPT(CURLOPT_URL, NULL);
- HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1);
+ HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1L);
HTTP_CURL_OPT(CURLOPT_PROXY, NULL);
HTTP_CURL_OPT(CURLOPT_PROXY, NULL);
- HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0);
- HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0);
+ HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0L);
+ HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0L);
HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
- HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0);
+ HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L);
HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL);
HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL);
- HTTP_CURL_OPT(CURLOPT_PORT, 0);
+ HTTP_CURL_OPT(CURLOPT_PORT, 0L);
#if HTTP_CURL_VERSION(7,15,2)
#if HTTP_CURL_VERSION(7,15,2)
- HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0);
- HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0);
+ HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0L);
+ HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0L);
#endif
HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
#endif
HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
- HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0);
+ HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
- HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0);
- HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0);
+ HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L);
+ HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L);
HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
#endif
HTTP_CURL_OPT(CURLOPT_RANGE, NULL);
HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
#endif
HTTP_CURL_OPT(CURLOPT_RANGE, NULL);
- HTTP_CURL_OPT(CURLOPT_RESUME_FROM, 0);
- HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, 0);
- HTTP_CURL_OPT(CURLOPT_TIMECONDITION, 0);
- HTTP_CURL_OPT(CURLOPT_TIMEVALUE, 0);
- HTTP_CURL_OPT(CURLOPT_TIMEOUT, 0);
+ HTTP_CURL_OPT(CURLOPT_RESUME_FROM, 0L);
+ HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, 0L);
+ HTTP_CURL_OPT(CURLOPT_TIMECONDITION, 0L);
+ HTTP_CURL_OPT(CURLOPT_TIMEVALUE, 0L);
+ HTTP_CURL_OPT(CURLOPT_TIMEOUT, 0L);
HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, 3);
HTTP_CURL_OPT(CURLOPT_SSLCERT, NULL);
HTTP_CURL_OPT(CURLOPT_SSLCERTTYPE, NULL);
HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, 3);
HTTP_CURL_OPT(CURLOPT_SSLCERT, NULL);
HTTP_CURL_OPT(CURLOPT_SSLCERTTYPE, NULL);
HTTP_CURL_OPT(CURLOPT_SSLKEYTYPE, NULL);
HTTP_CURL_OPT(CURLOPT_SSLKEYPASSWD, NULL);
HTTP_CURL_OPT(CURLOPT_SSLENGINE, NULL);
HTTP_CURL_OPT(CURLOPT_SSLKEYTYPE, NULL);
HTTP_CURL_OPT(CURLOPT_SSLKEYPASSWD, NULL);
HTTP_CURL_OPT(CURLOPT_SSLENGINE, NULL);
- HTTP_CURL_OPT(CURLOPT_SSLVERSION, 0);
- HTTP_CURL_OPT(CURLOPT_SSL_VERIFYPEER, 0);
- HTTP_CURL_OPT(CURLOPT_SSL_VERIFYHOST, 0);
+ HTTP_CURL_OPT(CURLOPT_SSLVERSION, 0L);
+ HTTP_CURL_OPT(CURLOPT_SSL_VERIFYPEER, 0L);
+ HTTP_CURL_OPT(CURLOPT_SSL_VERIFYHOST, 0L);
HTTP_CURL_OPT(CURLOPT_SSL_CIPHER_LIST, NULL);
HTTP_CURL_OPT(CURLOPT_CAINFO, NULL);
HTTP_CURL_OPT(CURLOPT_CAPATH, NULL);
HTTP_CURL_OPT(CURLOPT_RANDOM_FILE, NULL);
HTTP_CURL_OPT(CURLOPT_EGDSOCKET, NULL);
HTTP_CURL_OPT(CURLOPT_POSTFIELDS, NULL);
HTTP_CURL_OPT(CURLOPT_SSL_CIPHER_LIST, NULL);
HTTP_CURL_OPT(CURLOPT_CAINFO, NULL);
HTTP_CURL_OPT(CURLOPT_CAPATH, NULL);
HTTP_CURL_OPT(CURLOPT_RANDOM_FILE, NULL);
HTTP_CURL_OPT(CURLOPT_EGDSOCKET, NULL);
HTTP_CURL_OPT(CURLOPT_POSTFIELDS, NULL);
- HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, 0);
+ HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, 0L);
HTTP_CURL_OPT(CURLOPT_HTTPPOST, NULL);
HTTP_CURL_OPT(CURLOPT_IOCTLDATA, NULL);
HTTP_CURL_OPT(CURLOPT_READDATA, NULL);
HTTP_CURL_OPT(CURLOPT_HTTPPOST, NULL);
HTTP_CURL_OPT(CURLOPT_IOCTLDATA, NULL);
HTTP_CURL_OPT(CURLOPT_READDATA, NULL);
- HTTP_CURL_OPT(CURLOPT_INFILESIZE, 0);
+ HTTP_CURL_OPT(CURLOPT_INFILESIZE, 0L);
HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_NONE);
HTTP_CURL_OPT(CURLOPT_CUSTOMREQUEST, NULL);
HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_NONE);
HTTP_CURL_OPT(CURLOPT_CUSTOMREQUEST, NULL);
- HTTP_CURL_OPT(CURLOPT_NOBODY, 0);
- HTTP_CURL_OPT(CURLOPT_POST, 0);
- HTTP_CURL_OPT(CURLOPT_UPLOAD, 0);
- HTTP_CURL_OPT(CURLOPT_HTTPGET, 1);
+ HTTP_CURL_OPT(CURLOPT_NOBODY, 0L);
+ HTTP_CURL_OPT(CURLOPT_POST, 0L);
+ HTTP_CURL_OPT(CURLOPT_UPLOAD, 0L);
+ HTTP_CURL_OPT(CURLOPT_HTTPGET, 1L);
/* redirects, defaults to 0 */
if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) {
/* redirects, defaults to 0 */
if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) {
- HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
+ HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1L : 0L);
HTTP_CURL_OPT(CURLOPT_MAXREDIRS, Z_LVAL_P(zoption));
if ((zoption = http_request_option(request, options, "unrestrictedauth", IS_BOOL))) {
HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
HTTP_CURL_OPT(CURLOPT_MAXREDIRS, Z_LVAL_P(zoption));
if ((zoption = http_request_option(request, options, "unrestrictedauth", IS_BOOL))) {
HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
- if ((zoption = http_request_option(request, options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) != 0)) {
+ if ((zoption = http_request_option(request, options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) > 0)) {
range_req = 1;
HTTP_CURL_OPT(CURLOPT_RESUME_FROM, Z_LVAL_P(zoption));
}
range_req = 1;
HTTP_CURL_OPT(CURLOPT_RESUME_FROM, Z_LVAL_P(zoption));
}
if (Z_LVAL_P(zoption) > 0) {
HTTP_CURL_OPT(CURLOPT_TIMEVALUE, Z_LVAL_P(zoption));
} else {
if (Z_LVAL_P(zoption) > 0) {
HTTP_CURL_OPT(CURLOPT_TIMEVALUE, Z_LVAL_P(zoption));
} else {
- HTTP_CURL_OPT(CURLOPT_TIMEVALUE, HTTP_GET_REQUEST_TIME() + Z_LVAL_P(zoption));
+ HTTP_CURL_OPT(CURLOPT_TIMEVALUE, (long) HTTP_GET_REQUEST_TIME() + Z_LVAL_P(zoption));
- HTTP_CURL_OPT(CURLOPT_TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
+ HTTP_CURL_OPT(CURLOPT_TIMECONDITION, (long) (range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE));
} else {
HTTP_CURL_OPT(CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE);
}
} else {
HTTP_CURL_OPT(CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE);
}
/* don't load session cookies from cookiestore */
if ((zoption = http_request_option(request, options, "cookiesession", IS_BOOL)) && Z_BVAL_P(zoption)) {
/* don't load session cookies from cookiestore */
if ((zoption = http_request_option(request, options, "cookiesession", IS_BOOL)) && Z_BVAL_P(zoption)) {
- HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 1);
+ HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 1L);
}
/* cookiestore, read initial cookies from that file and store cookies back into that file */
}
/* cookiestore, read initial cookies from that file and store cookies back into that file */
/* request method */
switch (request->meth) {
case HTTP_GET:
/* request method */
switch (request->meth) {
case HTTP_GET:
- HTTP_CURL_OPT(CURLOPT_HTTPGET, 1);
+ HTTP_CURL_OPT(CURLOPT_HTTPGET, 1L);
- HTTP_CURL_OPT(CURLOPT_NOBODY, 1);
+ HTTP_CURL_OPT(CURLOPT_NOBODY, 1L);
- HTTP_CURL_OPT(CURLOPT_POST, 1);
+ HTTP_CURL_OPT(CURLOPT_POST, 1L);
- HTTP_CURL_OPT(CURLOPT_UPLOAD, 1);
+ HTTP_CURL_OPT(CURLOPT_UPLOAD, 1L);
HTTP_EMPTY_ARGS(enableCookies);
#if HTTP_CURL_VERSION(7,14,1)
HTTP_EMPTY_ARGS(enableCookies);
#if HTTP_CURL_VERSION(7,14,1)
-HTTP_EMPTY_ARGS(resetCookies);
+HTTP_BEGIN_ARGS(resetCookies, 0)
+ HTTP_ARG_VAL(session_only, 0)
+HTTP_END_ARGS;
#endif
HTTP_EMPTY_ARGS(getUrl);
#endif
HTTP_EMPTY_ARGS(getUrl);
#if HTTP_CURL_VERSION(7,14,1)
} else if (!strcmp(key, "resetcookies")) {
getObject(http_request_object, obj);
#if HTTP_CURL_VERSION(7,14,1)
} else if (!strcmp(key, "resetcookies")) {
getObject(http_request_object, obj);
- http_request_reset_cookies(obj->request);
+ http_request_reset_cookies(obj->request, 0);
+ } else if (!strcmp(key, "enablecookies")) {
+ getObject(http_request_object, obj);
+ http_request_enable_cookies(obj->request);
+ } else if (!strcasecmp(key, "recordHistory")) {
+ UPD_PROP(bool, recordHistory, 1);
} else {
ZVAL_ADDREF(*opt);
add_assoc_zval(add_opts, key, *opt);
} else {
ZVAL_ADDREF(*opt);
add_assoc_zval(add_opts, key, *opt);
-/* {{{ proto bool HttpRequest::resetCookies()
+/* {{{ proto bool HttpRequest::resetCookies([bool session_only = FALSE])
*
* Reset all automatically received/sent cookies.
* Note that customly set cookies are not affected.
*
* Reset all automatically received/sent cookies.
* Note that customly set cookies are not affected.
+ *
+ * Accepts an optional bool parameter specifying
+ * whether only session cookies should be reset
+ * (needs libcurl >= v7.15.4, else libcurl >= v7.14.1).
+ *
+ * Returns TRUE on success, or FALSE on failure.
*/
PHP_METHOD(HttpRequest, resetCookies)
{
*/
PHP_METHOD(HttpRequest, resetCookies)
{
- NO_ARGS {
- getObject(http_request_object, obj);
- RETURN_SUCCESS(http_request_reset_cookies(obj->request));
+ zend_bool session_only = 0;
+ getObject(http_request_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &session_only)) {
+ RETURN_FALSE;
+ RETURN_SUCCESS(http_request_reset_cookies(obj->request, session_only));
#define http_request_enable_cookies(r) _http_request_enable_cookies(r)
PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request);
#define http_request_enable_cookies(r) _http_request_enable_cookies(r)
PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request);
-#define http_request_reset_cookies(r) _http_request_reset_cookies(r)
-PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request);
+#define http_request_reset_cookies(r, s) _http_request_reset_cookies((r), (s))
+PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int session_only);
#define http_request_defaults(r) _http_request_defaults(r)
PHP_HTTP_API void _http_request_defaults(http_request *request);
#define http_request_defaults(r) _http_request_defaults(r)
PHP_HTTP_API void _http_request_defaults(http_request *request);