tony2001 Wed Jul 4 13:34:23 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/curl interface.c
Log:
MFH: add CURLINFO_PRIVATE & CURLOPT_PRIVATE
patch by Andrey A. Belashkov
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.815&r2=1.2027.2.547.2.816&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.815 php-src/NEWS:1.2027.2.547.2.816
--- php-src/NEWS:1.2027.2.547.2.815 Wed Jul 4 07:45:10 2007
+++ php-src/NEWS Wed Jul 4 13:34:23 2007
@@ -23,6 +23,8 @@
Tony)
- Added missing format validator to unpack() function. (Ilia)
- Added missing error check inside bcpowmod(). (Ilia)
+- Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants.
+ (Andrey A. Belashkov, Tony)
- Fixed var_export() to use the new H modifier so that it can generate
parseable PHP code for floats, independent of the locale. (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.26&r2=1.62.2.14.2.27&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.26
php-src/ext/curl/interface.c:1.62.2.14.2.27
--- php-src/ext/curl/interface.c:1.62.2.14.2.26 Tue May 22 08:39:20 2007
+++ php-src/ext/curl/interface.c Wed Jul 4 13:34:23 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.26 2007/05/22 08:39:20 pollita Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27 2007/07/04 13:34:23 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -482,6 +482,8 @@
REGISTER_CURL_CONSTANT(CURLOPT_FTP_CREATE_MISSING_DIRS);
#endif
+ REGISTER_CURL_CONSTANT(CURLOPT_PRIVATE);
+
/* Constants effecting the way CURLOPT_CLOSEPOLICY works */
REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_TRAFFIC);
@@ -511,6 +513,7 @@
REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_TIME);
REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT);
REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT);
+ REGISTER_CURL_CONSTANT(CURLINFO_PRIVATE);
/* cURL protocol constants (curl_version) */
REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6);
@@ -1299,6 +1302,7 @@
}
error = curl_easy_setopt(ch->cp, option,
Z_LVAL_PP(zvalue));
break;
+ case CURLOPT_PRIVATE:
case CURLOPT_URL:
case CURLOPT_PROXY:
case CURLOPT_USERPWD:
@@ -1802,6 +1806,7 @@
} else {
option = Z_LVAL_PP(zoption);
switch (option) {
+ case CURLINFO_PRIVATE:
case CURLINFO_EFFECTIVE_URL:
case CURLINFO_CONTENT_TYPE: {
char *s_code = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
