[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-06-28 Thread Pierre-Alain Joye 
pajoye  Sun Jun 28 10:00:28 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: fix regression introduced by the fix for #48518 (Ilia, Rasmus)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.57r2=1.62.2.14.2.58diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.57 
php-src/ext/curl/interface.c:1.62.2.14.2.58
--- php-src/ext/curl/interface.c:1.62.2.14.2.57 Mon Jun 15 12:38:11 2009
+++ php-src/ext/curl/interface.cSun Jun 28 10:00:28 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.57 2009/06/15 12:38:11 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.58 2009/06/28 10:00:28 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1829,6 +1829,14 @@
RETURN_STRINGL(ch-handlers-write-buf.c, 
ch-handlers-write-buf.len, 1);
}
 
+   /* flush the file handle, so any remaining data is synched to disk */
+   if (ch-handlers-write-method == PHP_CURL_FILE  
ch-handlers-write-fp) {
+   fflush(ch-handlers-write-fp);
+   }
+   if (ch-handlers-write_header-method == PHP_CURL_FILE  
ch-handlers-write_header-fp) {
+   fflush(ch-handlers-write_header-fp);
+   }
+
if (ch-handlers-write-method == PHP_CURL_RETURN) {
RETURN_EMPTY_STRING();
} else {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-06-15 Thread Ilia Alshanetsky 
iliaa   Mon Jun 15 12:38:11 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  
  MFB: Simplify original fix for bug #33475
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.56r2=1.62.2.14.2.57diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.56 
php-src/ext/curl/interface.c:1.62.2.14.2.57
--- php-src/ext/curl/interface.c:1.62.2.14.2.56 Fri Jun 12 20:50:58 2009
+++ php-src/ext/curl/interface.cMon Jun 15 12:38:11 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.56 2009/06/12 20:50:58 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.57 2009/06/15 12:38:11 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1824,14 +1824,11 @@
RETURN_FALSE;
}
 
-   ch-uses++;
-
if (ch-handlers-write-method == PHP_CURL_RETURN  
ch-handlers-write-buf.len  0) {
-   --ch-uses;
smart_str_0(ch-handlers-write-buf);
RETURN_STRINGL(ch-handlers-write-buf.c, 
ch-handlers-write-buf.len, 1);
}
-   --ch-uses;
+
if (ch-handlers-write-method == PHP_CURL_RETURN) {
RETURN_EMPTY_STRING();
} else {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-06-10 Thread Antony Dovgal 
tony2001Wed Jun 10 11:10:19 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: fix arginfo for curl_multi_info_read()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.53r2=1.62.2.14.2.54diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.53 
php-src/ext/curl/interface.c:1.62.2.14.2.54
--- php-src/ext/curl/interface.c:1.62.2.14.2.53 Wed May 27 22:38:53 2009
+++ php-src/ext/curl/interface.cWed Jun 10 11:10:19 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.53 2009/05/27 22:38:53 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.54 2009/06/10 11:10:19 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -295,7 +295,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_info_read, 0, 0, 1)
ZEND_ARG_INFO(0, mh)
-   ZEND_ARG_INFO(0, msgs_in_queue)
+   ZEND_ARG_INFO(1, msgs_in_queue)
 ZEND_END_ARG_INFO()
 
 static



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-05-27 Thread Antony Dovgal 
tony2001Wed May 27 09:57:13 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  fix build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.51r2=1.62.2.14.2.52diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.51 
php-src/ext/curl/interface.c:1.62.2.14.2.52
--- php-src/ext/curl/interface.c:1.62.2.14.2.51 Tue May 26 15:50:44 2009
+++ php-src/ext/curl/interface.cWed May 27 09:57:13 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.51 2009/05/26 15:50:44 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.52 2009/05/27 09:57:13 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -2061,7 +2061,7 @@
 #endif
 
/* Prevent crash inside cURL if passed file has already been closed */
-   if (ch-handlers-stderr  Z_REFCOUNT_P(ch-handlers-stderr) = 0) {
+   if (ch-handlers-stderr  ch-handlers-stderr-refcount = 0) {
curl_easy_setopt(ch-cp, CURLOPT_STDERR, stderr);
}
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c php_curl.h

2009-05-27 Thread Pierre-Alain Joye 
pajoye  Wed May 27 22:38:53 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c php_curl.h 
  Log:
  - mf53: fix build, stderr cannot be used as var or struct member
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.52r2=1.62.2.14.2.53diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.52 
php-src/ext/curl/interface.c:1.62.2.14.2.53
--- php-src/ext/curl/interface.c:1.62.2.14.2.52 Wed May 27 09:57:13 2009
+++ php-src/ext/curl/interface.cWed May 27 22:38:53 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.52 2009/05/27 09:57:13 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.53 2009/05/27 22:38:53 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1462,11 +1462,11 @@
break;
case CURLOPT_STDERR:
if (((php_stream *) what)-mode[0] != 
'r') {
-   if (ch-handlers-stderr) {
-   
zval_ptr_dtor(ch-handlers-stderr);
+   if (ch-handlers-std_err) {
+   
zval_ptr_dtor(ch-handlers-std_err);
}
zval_add_ref(zvalue);
-   ch-handlers-stderr = *zvalue;
+   ch-handlers-std_err = *zvalue;

zend_list_addref(Z_LVAL_PP(zvalue));
} else {
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
@@ -2061,7 +2061,7 @@
 #endif
 
/* Prevent crash inside cURL if passed file has already been closed */
-   if (ch-handlers-stderr  ch-handlers-stderr-refcount = 0) {
+   if (ch-handlers-std_err  ch-handlers-std_err-refcount = 0) {
curl_easy_setopt(ch-cp, CURLOPT_STDERR, stderr);
}
 
@@ -2087,8 +2087,8 @@
if (ch-handlers-passwd) {
zval_ptr_dtor(ch-handlers-passwd);
}
-   if (ch-handlers-stderr) {
-   zval_ptr_dtor(ch-handlers-stderr);
+   if (ch-handlers-std_err) {
+   zval_ptr_dtor(ch-handlers-std_err);
}
if (ch-header.str_len  0) {
efree(ch-header.str);
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/php_curl.h?r1=1.44.2.2.2.6r2=1.44.2.2.2.7diff_format=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.44.2.2.2.6 
php-src/ext/curl/php_curl.h:1.44.2.2.2.7
--- php-src/ext/curl/php_curl.h:1.44.2.2.2.6Tue May 26 15:50:44 2009
+++ php-src/ext/curl/php_curl.h Wed May 27 22:38:53 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_curl.h,v 1.44.2.2.2.6 2009/05/26 15:50:44 jani Exp $ */
+/* $Id: php_curl.h,v 1.44.2.2.2.7 2009/05/27 22:38:53 pajoye Exp $ */
 
 #ifndef _PHP_CURL_H
 #define _PHP_CURL_H
@@ -101,7 +101,7 @@
php_curl_write *write_header;
php_curl_read  *read;
zval   *passwd;
-   zval   *stderr;
+   zval   *std_err;
 } php_curl_handlers;
 
 struct _php_curl_error  {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-05-20 Thread Antony Dovgal 
tony2001Wed May 20 09:26:21 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  sync with HEAD
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.48r2=1.62.2.14.2.49diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.48 
php-src/ext/curl/interface.c:1.62.2.14.2.49
--- php-src/ext/curl/interface.c:1.62.2.14.2.48 Tue May 19 13:50:32 2009
+++ php-src/ext/curl/interface.cWed May 20 09:26:20 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.48 2009/05/19 13:50:32 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.49 2009/05/20 09:26:20 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1094,7 +1094,8 @@
array_init(protocol_list);
 
while (*p != NULL) {
-   add_next_index_string(protocol_list,  *p++, 1);
+   add_next_index_string(protocol_list,  *p, 1);
+   p++;
}
CAAZ(protocols, protocol_list);
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-05-19 Thread Jani Taskinen 
janiTue May 19 13:50:33 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: Sync with PHP_5_3 the WS/CS and some missing constant fixes
  http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.47r2=1.62.2.14.2.48diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.47 
php-src/ext/curl/interface.c:1.62.2.14.2.48
--- php-src/ext/curl/interface.c:1.62.2.14.2.47 Mon May 18 09:11:31 2009
+++ php-src/ext/curl/interface.cTue May 19 13:50:32 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.47 2009/05/18 09:11:31 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.48 2009/05/19 13:50:32 jani Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -158,13 +158,14 @@
 #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
 
 #if defined(PHP_WIN32) || defined(__GNUC__)
- #define php_curl_ret(__ret) RETVAL_FALSE; return __ret;
+# define php_curl_ret(__ret) RETVAL_FALSE; return __ret;
 #else
- #define php_curl_ret(__ret) RETVAL_FALSE; return;
+# define php_curl_ret(__ret) RETVAL_FALSE; return;
 #endif
 
-static int php_curl_option_url(php_curl *ch, const char *url, const int len) {
-   CURLcode error=CURLE_OK;
+static int php_curl_option_url(php_curl *ch, const char *url, const int len) 
/* {{{ */
+{
+   CURLcode error = CURLE_OK;
 #if LIBCURL_VERSION_NUM  0x071100
char *copystr = NULL;
 #endif
@@ -201,6 +202,7 @@
 
return (error == CURLE_OK ? 1 : 0);
 }
+/* }}} */
 
 /* {{{ arginfo */
 static
@@ -300,7 +302,6 @@
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)
ZEND_ARG_INFO(0, mh)
 ZEND_END_ARG_INFO()
-
 /* }}} */
 
 /* {{{ curl_functions[]
@@ -368,6 +369,10 @@
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, 
curl, module_number);
le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl, 
module_number);
 
+   /* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
+  or curl src/docs/libcurl/symbols-in-versions for a (almost) complete 
list 
+  of options and which version they were introduced */
+
/* Constants for curl_setopt() */
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
@@ -481,14 +486,14 @@
REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
 
 #if LIBCURL_VERSION_NUM  0x070a05 /* CURLOPT_HTTPAUTH is available since curl 
7.10.6 */
-   REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
-   /* http authentication options */
-   REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
-   REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
-   REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
-   REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
-   REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
-   REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
+   REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
+   /* http authentication options */
+   REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
+   REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
+   REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
+   REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
+   REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
+   REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
 #endif
 
 #if LIBCURL_VERSION_NUM  0x070a06 /* CURLOPT_PROXYAUTH  
CURLOPT_FTP_CREATE_MISSING_DIRS are available since curl 7.10.7 */
@@ -608,8 +613,8 @@
 #if LIBCURL_VERSION_NUM = 0x070b00
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
 #endif
-
REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
+   REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
 
REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL);
@@ -1059,7 +1064,7 @@
 PHP_FUNCTION(curl_version)
 {
curl_version_info_data *d;
-   longuversion = CURLVERSION_NOW;
+   long uversion = CURLVERSION_NOW;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, uversion) 
== FAILURE) {
return;
@@ -1123,10 +1128,10 @@
Initialize a cURL session */
 PHP_FUNCTION(curl_init)
 {
-   zval   **url;
-   php_curl*ch;
-   CURL*cp;
-   int  argc = ZEND_NUM_ARGS();
+   php_curl*ch;
+   zval**url;
+   CURL*cp;
+   int argc = ZEND_NUM_ARGS();
 
if (argc  0 || argc  1 || zend_get_parameters_ex(argc, url) == 
FAILURE) {
WRONG_PARAM_COUNT;
@@ -1186,14 +1191,14 @@
Copy a cURL handle along with all of it's preferences */
 PHP_FUNCTION(curl_copy_handle)
 {
-   zval **zid;
-   CURL  *cp;
-   php_curl  *ch;
-   php_curl  *dupch;
+   CURL*cp;
+   zval**zid;
+   php_curl*ch, *dupch;
 
if

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-05-18 Thread Pierre-Alain Joye 
pajoye  Mon May 18 09:11:31 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  - WS
  http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.46r2=1.62.2.14.2.47diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.46 
php-src/ext/curl/interface.c:1.62.2.14.2.47
--- php-src/ext/curl/interface.c:1.62.2.14.2.46 Thu Apr 16 14:26:09 2009
+++ php-src/ext/curl/interface.cMon May 18 09:11:31 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.46 2009/04/16 14:26:09 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.47 2009/05/18 09:11:31 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -367,7 +367,7 @@
 {
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, 
curl, module_number);
le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl, 
module_number);
-   
+
/* Constants for curl_setopt() */
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
@@ -435,7 +435,7 @@
REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
-#if CURLOPT_PASSWDFUNCTION != 0 
+#if CURLOPT_PASSWDFUNCTION != 0
REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
 #endif
REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
@@ -534,7 +534,7 @@
REGISTER_CURL_CONSTANT(CURL_VERSION_KERBEROS4);
REGISTER_CURL_CONSTANT(CURL_VERSION_SSL);
REGISTER_CURL_CONSTANT(CURL_VERSION_LIBZ);
-   
+
/* version constants */
REGISTER_CURL_CONSTANT(CURLVERSION_NOW);
 
@@ -619,7 +619,7 @@
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_NONE);
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_0);
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_1);
-   
+
REGISTER_CURL_CONSTANT(CURLM_CALL_MULTI_PERFORM);
REGISTER_CURL_CONSTANT(CURLM_OK);
REGISTER_CURL_CONSTANT(CURLM_BAD_HANDLE);
@@ -665,13 +665,13 @@
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
-   
+
php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
-   
+
for (i = 0; i  c; ++i) {
php_curl_openssl_tsl[i] = tsrm_mutex_alloc();
}
-   
+
CRYPTO_set_id_callback(php_curl_ssl_id);
CRYPTO_set_locking_callback(php_curl_ssl_lock);
}
@@ -679,7 +679,7 @@
 #ifdef PHP_CURL_NEED_GNUTLS_TSL
gcry_control(GCRYCTL_SET_THREAD_CBS, php_curl_gnutls_tsl);
 #endif
-   
+
if (curl_global_init(CURL_GLOBAL_SSL) != CURLE_OK) {
return FAILURE;
}
@@ -701,7 +701,7 @@
php_register_url_stream_wrapper(ldap, php_curl_wrapper TSRMLS_CC);
 # endif
 #endif
-   
+
return SUCCESS;
 }
 /* }}} */
@@ -720,14 +720,14 @@
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (php_curl_openssl_tsl) {
int i, c = CRYPTO_num_locks();
-   
+
CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL);
-   
+
for (i = 0; i  c; ++i) {
tsrm_mutex_free(php_curl_openssl_tsl[i]);
}
-   
+
free(php_curl_openssl_tsl);
php_curl_openssl_tsl = NULL;
}
@@ -749,7 +749,7 @@
fprintf(stderr, curl_write() called\n);
fprintf(stderr, data = %s, size = %d, nmemb = %d, ctx = %x\n, data, 
size, nmemb, ctx);
 #endif
-   
+
switch (t-method) {
case PHP_CURL_STDOUT:
PHPWRITE(data, length);
@@ -773,7 +773,7 @@
ZVAL_RESOURCE(handle, ch-id);
zend_list_addref(ch-id);
argv[0] = handle;
-   
+
MAKE_STD_ZVAL(zdata);
ZVAL_STRINGL(zdata, data, length, 1);
argv[1] = zdata;
@@ -864,7 +864,7 @@
error = zend_call_function(fci, t-fci_cache 
TSRMLS_CC);
ch-in_callback = 0;
if (error == FAILURE) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Cannot call the CURLOPT_READFUNCTION); 
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Cannot call the CURLOPT_READFUNCTION);
 #if LIBCURL_VERSION_NUM = 0x070c01 /* 7.12.1 */
length = CURL_READFUNC_ABORT;
 #endif
@@ -895,7 +895,7 @@
php_curl_write *t   = ch-handlers-write_header;
size_t  length = size * nmemb;

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-04-16 Thread Pierre-Alain Joye 
pajoye  Thu Apr 16 09:47:33 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  - disable file:// when safe_mode or open_basedir are enabled
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.43r2=1.62.2.14.2.44diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.43 
php-src/ext/curl/interface.c:1.62.2.14.2.44
--- php-src/ext/curl/interface.c:1.62.2.14.2.43 Mon Mar 16 15:09:51 2009
+++ php-src/ext/curl/interface.cThu Apr 16 09:47:33 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.43 2009/03/16 15:09:51 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.44 2009/04/16 09:47:33 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -162,31 +162,43 @@
  #define php_curl_ret(__ret) RETVAL_FALSE; return;
 #endif
 
-#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len, __ret)   
\
-   if (((PG(open_basedir)  *PG(open_basedir)) || PG(safe_mode))
 \
-   strncasecmp(str, file:, sizeof(file:) - 1) == 0)
\
-   {   

\
-   php_url *tmp_url;   

\
-   
\
-   if (!(tmp_url = php_url_parse_ex(str, len))) {  
\
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
URL '%s', str);   \
-   php_curl_ret(__ret);
\
-   }   
\
-   
\
-   if (tmp_url-host || !php_memnstr(str, tmp_url-path, 
strlen(tmp_url-path), str + len)) {  \
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, URL '%s' 
contains unencoded control characters, str); \
-   php_url_free(tmp_url);  

\
-   php_curl_ret(__ret);
\
-   }   
\
-   

\
-   if (tmp_url-query || tmp_url-fragment || 
php_check_open_basedir(tmp_url-path TSRMLS_CC) ||  
 \
-   (PG(safe_mode)  !php_checkuid(tmp_url-path, rb+, 
CHECKUID_CHECK_MODE_PARAM))   \
-   ) { 

\
-   php_url_free(tmp_url);  

\
-   php_curl_ret(__ret);
\
-   }   

\
-   php_url_free(tmp_url);  

\
+static int php_curl_option_url(php_curl *ch, const char *url, const int len) {
+   CURLcode error=CURLE_OK;
+#if LIBCURL_VERSION_NUM  0x071100
+   char *copystr = NULL;
+#endif
+
+   /* Disable file:// if open_basedir or safe_mode are used */
+   if ((PG(open_basedir)  *PG(open_basedir)) || PG(safe_mode)) {
+#if LIBCURL_VERSION_NUM = 0x071304
+   error = curl_easy_setopt(ch-cp, CURLOPT_PROTOCOLS, 
CURLPROTO_ALL

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-04-16 Thread Pierre-Alain Joye 
pajoye  Thu Apr 16 14:26:09 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  - fix zts build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.45r2=1.62.2.14.2.46diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.45 
php-src/ext/curl/interface.c:1.62.2.14.2.46
--- php-src/ext/curl/interface.c:1.62.2.14.2.45 Thu Apr 16 13:51:55 2009
+++ php-src/ext/curl/interface.cThu Apr 16 14:26:09 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.45 2009/04/16 13:51:55 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.46 2009/04/16 14:26:09 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -168,6 +168,7 @@
 #if LIBCURL_VERSION_NUM  0x071100
char *copystr = NULL;
 #endif
+   TSRMLS_FETCH();
 
/* Disable file:// if open_basedir or safe_mode are used */
if ((PG(open_basedir)  *PG(open_basedir)) || PG(safe_mode)) {
@@ -1171,7 +1172,7 @@
 
if (argc  0) {
if (!php_curl_option_url(ch, Z_STRVAL_PP(url), 
Z_STRLEN_PP(url))) {
-   _php_curl_close_ex(ch);
+   _php_curl_close_ex(ch TSRMLS_CC);
RETURN_FALSE;
}
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-04-16 Thread Pierre-Alain Joye 
pajoye  Thu Apr 16 13:51:55 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  - improve file:// deactivation in curl_init and do not allow to enable it 
again manually
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.44r2=1.62.2.14.2.45diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.44 
php-src/ext/curl/interface.c:1.62.2.14.2.45
--- php-src/ext/curl/interface.c:1.62.2.14.2.44 Thu Apr 16 09:47:33 2009
+++ php-src/ext/curl/interface.cThu Apr 16 13:51:55 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.44 2009/04/16 09:47:33 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.45 2009/04/16 13:51:55 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -147,6 +147,7 @@
 #endif
 /* }}} */
 
+static void _php_curl_close_ex(php_curl *ch TSRMLS_DC);
 static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 
 #define SAVE_CURL_ERROR(__handle, __err) (__handle)-err.no = (int) __err;
@@ -1170,6 +1171,7 @@
 
if (argc  0) {
if (!php_curl_option_url(ch, Z_STRVAL_PP(url), 
Z_STRLEN_PP(url))) {
+   _php_curl_close_ex(ch);
RETURN_FALSE;
}
}
@@ -1331,6 +1333,13 @@
case CURLOPT_PROTOCOLS:
 #endif
convert_to_long_ex(zvalue);
+#if LIBCURL_VERSION_NUM = 0x71304
+   if (((PG(open_basedir)  *PG(open_basedir)) || 
PG(safe_mode))  (Z_LVAL_PP(zvalue)  CURLPROTO_FILE)) {
+   php_error_docref(NULL TSRMLS_CC, 
E_WARNING, CURLPROTO_FILE cannot be activated when in safe_mode or an 
open_basedir is set);
+   RETVAL_FALSE;
+   return 1;
+   }
+#endif
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;
case CURLOPT_FOLLOWLOCATION:
@@ -2011,10 +2020,8 @@
 
 /* {{{ _php_curl_close()
List destructor for curl handles */
-static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+static void _php_curl_close_ex(php_curl *ch TSRMLS_DC)
 {
-   php_curl *ch = (php_curl *) rsrc-ptr;
-
 #if PHP_CURL_DEBUG
fprintf(stderr, DTOR CALLED, ch = %x\n, ch);
 #endif
@@ -2053,6 +2060,15 @@
 }  
 /* }}} */
 
+/* {{{ _php_curl_close()
+   List destructor for curl handles */
+static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+   php_curl *ch = (php_curl *) rsrc-ptr;
+   _php_curl_close_ex(ch TSRMLS_CC);
+}  
+/* }}} */
+
 #endif /* HAVE_CURL */
 
 /*



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2009-03-13 Thread Stanislav Malyshev 
stasFri Mar 13 19:43:50 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  add new CURL options
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.41r2=1.62.2.14.2.42diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.41 
php-src/ext/curl/interface.c:1.62.2.14.2.42
--- php-src/ext/curl/interface.c:1.62.2.14.2.41 Mon Jan 26 15:25:23 2009
+++ php-src/ext/curl/interface.cFri Mar 13 19:43:49 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.41 2009/01/26 15:25:23 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.42 2009/03/13 19:43:49 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -630,6 +630,24 @@
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 #endif
 
+#if LIBCURL_VERSION_NUM = 0x071304
+   REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SCP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TELNET);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_DICT);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FILE);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1303,6 +1321,10 @@
 #if LIBCURL_VERSION_NUM  0x070b01 /* CURLOPT_TCP_NODELAY is available since 
curl 7.11.2 */
case CURLOPT_TCP_NODELAY:
 #endif
+#if LIBCURL_VERSION_NUM = 0x71304
+   case CURLOPT_REDIR_PROTOCOLS:
+   case CURLOPT_PROTOCOLS:
+#endif
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2008-12-04 Thread Mikko Koppanen 
mkoppanen   Thu Dec  4 13:13:41 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  Fixes bug #46739
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.37r2=1.62.2.14.2.38diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.37 
php-src/ext/curl/interface.c:1.62.2.14.2.38
--- php-src/ext/curl/interface.c:1.62.2.14.2.37 Thu Nov 27 17:01:29 2008
+++ php-src/ext/curl/interface.cThu Dec  4 13:13:41 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.37 2008/11/27 17:01:29 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.38 2008/12/04 13:13:41 mkoppanen Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1770,6 +1770,11 @@
if (curl_easy_getinfo(ch-cp, CURLINFO_CONTENT_TYPE, s_code) 
== CURLE_OK) {
if (s_code != NULL) {
CAAS(content_type, s_code);
+   } else {
+   zval *retnull;
+   MAKE_STD_ZVAL(retnull);
+   ZVAL_NULL(retnull);
+   CAAZ(content_type, retnull);
}
}
if (curl_easy_getinfo(ch-cp, CURLINFO_HTTP_CODE, l_code) == 
CURLE_OK) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2008-07-29 Thread Antony Dovgal 
tony2001Tue Jul 29 10:42:59 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: fix copy/paste error (patch by Mikko)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.35r2=1.62.2.14.2.36diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.35 
php-src/ext/curl/interface.c:1.62.2.14.2.36
--- php-src/ext/curl/interface.c:1.62.2.14.2.35 Sat Jul 12 21:11:56 2008
+++ php-src/ext/curl/interface.cTue Jul 29 10:42:59 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.35 2008/07/12 21:11:56 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.36 2008/07/29 10:42:59 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1421,7 +1421,7 @@
case CURLOPT_READFUNCTION:
if (ch-handlers-read-func_name) {
zval_ptr_dtor(ch-handlers-read-func_name);
-   ch-handlers-write-fci_cache = 
empty_fcall_info_cache;
+   ch-handlers-read-fci_cache = 
empty_fcall_info_cache;
}
zval_add_ref(zvalue);
ch-handlers-read-func_name = *zvalue;
@@ -1430,7 +1430,7 @@
case CURLOPT_HEADERFUNCTION:
if (ch-handlers-write_header-func_name) {

zval_ptr_dtor(ch-handlers-write_header-func_name);
-   ch-handlers-write-fci_cache = 
empty_fcall_info_cache;
+   ch-handlers-write_header-fci_cache = 
empty_fcall_info_cache;
}
zval_add_ref(zvalue);
ch-handlers-write_header-func_name = *zvalue;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2008-07-12 Thread Felipe Pena 
felipe  Sat Jul 12 21:11:56 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  - Fixed bug #45220 (curl_read callback returns -1 when needs to return size_t 
(unsigned))
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.34r2=1.62.2.14.2.35diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.34 
php-src/ext/curl/interface.c:1.62.2.14.2.35
--- php-src/ext/curl/interface.c:1.62.2.14.2.34 Sun Jan  6 17:12:29 2008
+++ php-src/ext/curl/interface.cSat Jul 12 21:11:56 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.34 2008/01/06 17:12:29 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.35 2008/07/12 21:11:56 felipe Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -786,7 +786,7 @@
 {
php_curl   *ch = (php_curl *) ctx;
php_curl_read  *t  = ch-handlers-read;
-   int length = -1;
+   int length = 0;
 
switch (t-method) {
case PHP_CURL_DIRECT:
@@ -833,7 +833,9 @@
ch-in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Cannot call the CURLOPT_READFUNCTION); 
-   length = -1;
+#if LIBCURL_VERSION_NUM = 0x070c01 /* 7.12.1 */
+   length = CURL_READFUNC_ABORT;
+#endif
} else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) == IS_STRING) {
length = MIN(size * nmemb, 
Z_STRLEN_P(retval_ptr));



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c multi.c

2007-12-04 Thread Antony Dovgal 
tony2001Tue Dec  4 08:56:14 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c multi.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.30r2=1.62.2.14.2.31diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.30 
php-src/ext/curl/interface.c:1.62.2.14.2.31
--- php-src/ext/curl/interface.c:1.62.2.14.2.30 Fri Nov 16 14:19:35 2007
+++ php-src/ext/curl/interface.cTue Dec  4 08:56:14 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.30 2007/11/16 14:19:35 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.31 2007/12/04 08:56:14 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -931,7 +931,7 @@
 }
 /* }}} */
 
-static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, 
void *ctx)
+static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, 
void *ctx) /* {{{ */
 {
php_curl*ch   = (php_curl *) ctx;
 
@@ -947,6 +947,7 @@
 
return 0;
 }
+/* }}} */
 
 #if CURLOPT_PASSWDFUNCTION != 0
 /* {{{ curl_passwd
@@ -1214,7 +1215,7 @@
 }
 /* }}} */
 
-static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval 
*return_value TSRMLS_DC)
+static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval 
*return_value TSRMLS_DC) /* {{{ */
 {
CURLcode error=CURLE_OK;
 
@@ -1603,6 +1604,7 @@
return 0;
}
 }
+/* }}} */
 
 /* {{{ proto bool curl_setopt(resource ch, int option, mixed value)
Set an option for a cURL transfer */
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/multi.c?r1=1.19.2.3.2.7r2=1.19.2.3.2.8diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.19.2.3.2.7 
php-src/ext/curl/multi.c:1.19.2.3.2.8
--- php-src/ext/curl/multi.c:1.19.2.3.2.7   Mon Jan  1 09:35:48 2007
+++ php-src/ext/curl/multi.cTue Dec  4 08:56:14 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: multi.c,v 1.19.2.3.2.7 2007/01/01 09:35:48 sebastian Exp $ */
+/* $Id: multi.c,v 1.19.2.3.2.8 2007/12/04 08:56:14 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -122,13 +122,13 @@
 /* }}} */
 
 /* Used internally as comparison routine passed to zend_list_del_element */
-static int curl_compare_resources( zval *z1, zval **z2 )
+static int curl_compare_resources( zval *z1, zval **z2 ) /* {{{ */
 {
return (Z_TYPE_P( z1 ) == Z_TYPE_PP( z2 )  
 Z_TYPE_P( z1 ) == IS_RESOURCE 
 Z_LVAL_P( z1 ) == Z_LVAL_PP( z2 ) );
 }
-
+/* }}} */
 
 /* {{{ proto int curl_multi_remove_handle(resource mh, resource ch)
Remove a multi handle from a set of cURL handles */
@@ -155,7 +155,7 @@
 }
 /* }}} */
 
-static void _make_timeval_struct(struct timeval *to, double timeout)
+static void _make_timeval_struct(struct timeval *to, double timeout) /* {{{ */
 {
unsigned long conv;
 
@@ -163,6 +163,7 @@
to-tv_sec = conv / 100;
to-tv_usec = conv % 100;
 }
+/* }}} */
 
 /* {{{ proto int curl_multi_select(resource mh[, double timeout])
Get all the sockets associated with the cURL extension, which can then be 
selected */
@@ -319,7 +320,7 @@
 }
 /* }}} */
 
-void _php_curl_multi_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+void _php_curl_multi_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
 {
php_curlm *mh = (php_curlm *) rsrc-ptr;
if (mh) {
@@ -329,6 +330,7 @@
rsrc-ptr = NULL;
}
 }
+/* }}} */
 
 #endif
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2007-10-13 Thread Hannes Magnusson 
bjori   Sat Oct 13 11:35:35 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: fix typo and remove dots in error message
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.28r2=1.62.2.14.2.29diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.28 
php-src/ext/curl/interface.c:1.62.2.14.2.29
--- php-src/ext/curl/interface.c:1.62.2.14.2.28 Wed Oct  3 20:34:48 2007
+++ php-src/ext/curl/interface.cSat Oct 13 11:35:35 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.28 2007/10/03 20:34:48 mike Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.29 2007/10/13 11:35:35 bjori Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -174,7 +174,7 @@
}   
\

\
if (!php_memnstr(str, tmp_url-path, strlen(tmp_url-path), str 
+ len)) {   \
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, URL '%s' 
contains unencoded control characters., str);\
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, URL '%s' 
contains unencoded control characters, str); \
php_url_free(tmp_url);  

\
php_curl_ret(__ret);
\
}   
\
@@ -980,7 +980,7 @@
strlcpy(buf, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
}
} else {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, User handler '%s' 
did not return a string., Z_STRVAL_P(func));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, User handler '%s' 
did not return a string, Z_STRVAL_P(func));
}

zval_ptr_dtor(argv[0]);
@@ -1645,7 +1645,7 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)entry, 
pos) == SUCCESS) {
if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), string_key, 
str_key_len, option, 0, pos) == HASH_KEY_IS_STRING) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Array keys 
must be CURLOPT constants or equivalent interger values.); 
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Array keys 
must be CURLOPT constants or equivalent integer values); 
RETURN_FALSE;
}
if (_php_curl_setopt(ch, option, entry, return_value 
TSRMLS_CC)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2007-10-03 Thread Michael Wallner 
mikeWed Oct  3 20:34:48 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: fix CURLOPT_TIMEOUT_MS support
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27r2=1.62.2.14.2.28diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27 
php-src/ext/curl/interface.c:1.62.2.14.2.28
--- php-src/ext/curl/interface.c:1.62.2.14.2.27 Wed Jul  4 13:34:23 2007
+++ php-src/ext/curl/interface.cWed Oct  3 20:34:48 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27 2007/07/04 13:34:23 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.28 2007/10/03 20:34:48 mike Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -387,7 +387,7 @@
REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD);
REGISTER_CURL_CONSTANT(CURLOPT_RANGE);
REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT);
-#ifdef CURLOPT_TIMEOUT_MS
+#if LIBCURL_VERSION_NUM  0x071002
REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS);
 #endif
REGISTER_CURL_CONSTANT(CURLOPT_POSTFIELDS);
@@ -433,7 +433,7 @@
REGISTER_CURL_CONSTANT(CURLOPT_RANDOM_FILE);
REGISTER_CURL_CONSTANT(CURLOPT_EGDSOCKET);
REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT);
-#ifdef CURLOPT_CONNECTTIMEOUT_MS
+#if LIBCURL_VERSION_NUM  0x071002
REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS);
 #endif
REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER);
@@ -1233,7 +1233,7 @@
 case CURLOPT_MUTE:
 #endif
case CURLOPT_TIMEOUT:
-#ifdef CURLOPT_TIMEOUT_MS
+#if LIBCURL_VERSION_NUM  0x071002
case CURLOPT_TIMEOUT_MS:
 #endif
case CURLOPT_FTP_USE_EPSV:
@@ -1252,7 +1252,7 @@
case CURLOPT_FRESH_CONNECT:
case CURLOPT_FORBID_REUSE:
case CURLOPT_CONNECTTIMEOUT:
-#ifdef CURLOPT_CONNECTTIMEOUT_MS
+#if LIBCURL_VERSION_NUM  0x071002
case CURLOPT_CONNECTTIMEOUT_MS:
 #endif
case CURLOPT_SSL_VERIFYHOST:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2007-05-22 Thread Sara Golemon 
pollita Tue May 22 08:39:20 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH(r-1.112) Add CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS option 
constants
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.25r2=1.62.2.14.2.26diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.25 
php-src/ext/curl/interface.c:1.62.2.14.2.26
--- php-src/ext/curl/interface.c:1.62.2.14.2.25 Mon Apr 23 14:36:56 2007
+++ php-src/ext/curl/interface.cTue May 22 08:39:20 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.25 2007/04/23 14:36:56 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.26 2007/05/22 08:39:20 pollita Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -387,6 +387,9 @@
REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD);
REGISTER_CURL_CONSTANT(CURLOPT_RANGE);
REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT);
+#ifdef CURLOPT_TIMEOUT_MS
+   REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_POSTFIELDS);
REGISTER_CURL_CONSTANT(CURLOPT_REFERER);
REGISTER_CURL_CONSTANT(CURLOPT_USERAGENT);
@@ -430,6 +433,9 @@
REGISTER_CURL_CONSTANT(CURLOPT_RANDOM_FILE);
REGISTER_CURL_CONSTANT(CURLOPT_EGDSOCKET);
REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT);
+#ifdef CURLOPT_CONNECTTIMEOUT_MS
+   REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER);
REGISTER_CURL_CONSTANT(CURLOPT_CAINFO);
REGISTER_CURL_CONSTANT(CURLOPT_CAPATH);
@@ -1224,6 +1230,9 @@
 case CURLOPT_MUTE:
 #endif
case CURLOPT_TIMEOUT:
+#ifdef CURLOPT_TIMEOUT_MS
+   case CURLOPT_TIMEOUT_MS:
+#endif
case CURLOPT_FTP_USE_EPSV:
case CURLOPT_LOW_SPEED_LIMIT:
case CURLOPT_SSLVERSION:
@@ -1240,6 +1249,9 @@
case CURLOPT_FRESH_CONNECT:
case CURLOPT_FORBID_REUSE:
case CURLOPT_CONNECTTIMEOUT:
+#ifdef CURLOPT_CONNECTTIMEOUT_MS
+   case CURLOPT_CONNECTTIMEOUT_MS:
+#endif
case CURLOPT_SSL_VERIFYHOST:
case CURLOPT_SSL_VERIFYPEER:
case CURLOPT_DNS_USE_GLOBAL_CACHE:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2007-03-08 Thread Rasmus Lerdorf 
rasmus  Fri Mar  9 01:20:34 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  Off by ! in the url control char check for file:/// urls
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.23r2=1.62.2.14.2.24diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.23 
php-src/ext/curl/interface.c:1.62.2.14.2.24
--- php-src/ext/curl/interface.c:1.62.2.14.2.23 Fri Feb 23 20:51:02 2007
+++ php-src/ext/curl/interface.cFri Mar  9 01:20:34 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.23 2007/02/23 20:51:02 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.24 2007/03/09 01:20:34 rasmus Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -173,7 +173,7 @@
php_curl_ret(__ret);
\
}   
\

\
-   if (php_memnstr(str, tmp_url-path, strlen(tmp_url-path), str 
+ len)) {\
+   if (!php_memnstr(str, tmp_url-path, strlen(tmp_url-path), str 
+ len)) {   \
php_error_docref(NULL TSRMLS_CC, E_WARNING, URL '%s' 
contains unencoded control characters., str);\
php_url_free(tmp_url);  

\
php_curl_ret(__ret);
\

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2007-02-23 Thread Antony Dovgal 
tony2001Fri Feb 23 20:51:02 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: fix leak
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.22r2=1.62.2.14.2.23diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.22 
php-src/ext/curl/interface.c:1.62.2.14.2.23
--- php-src/ext/curl/interface.c:1.62.2.14.2.22 Fri Jan 19 18:03:33 2007
+++ php-src/ext/curl/interface.cFri Feb 23 20:51:02 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.22 2007/01/19 18:03:33 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.23 2007/02/23 20:51:02 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -715,7 +715,9 @@
case PHP_CURL_FILE:
return fwrite(data, size, nmemb, t-fp);
case PHP_CURL_RETURN:
-   smart_str_appendl(t-buf, data, (int) length);
+   if (length  0) {
+   smart_str_appendl(t-buf, data, (int) length);
+   }
break;
case PHP_CURL_USER: {
zval **argv[2];
@@ -854,7 +856,7 @@
case PHP_CURL_STDOUT:
/* Handle special case write when we're returning the 
entire transfer
 */
-   if (ch-handlers-write-method == PHP_CURL_RETURN) {
+   if (ch-handlers-write-method == PHP_CURL_RETURN  
length  0) {
smart_str_appendl(ch-handlers-write-buf, 
data, (int) length);
} else {
PHPWRITE(data, length);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2007-01-19 Thread Antony Dovgal 
tony2001Fri Jan 19 18:03:33 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.21r2=1.62.2.14.2.22diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.21 
php-src/ext/curl/interface.c:1.62.2.14.2.22
--- php-src/ext/curl/interface.c:1.62.2.14.2.21 Fri Jan 19 15:38:51 2007
+++ php-src/ext/curl/interface.cFri Jan 19 18:03:33 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.21 2007/01/19 15:38:51 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.22 2007/01/19 18:03:33 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1268,10 +1268,10 @@
case CURLOPT_COOKIESESSION:
 #if LIBCURL_VERSION_NUM  0x070b01 /* CURLOPT_TCP_NODELAY is available since 
curl 7.11.2 */
case CURLOPT_TCP_NODELAY:
+#endif
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;
-#endif
case CURLOPT_FOLLOWLOCATION:
convert_to_long_ex(zvalue);
if ((PG(open_basedir)  *PG(open_basedir)) || 
PG(safe_mode)) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2006-12-26 Thread Ilia Alshanetsky 
iliaa   Tue Dec 26 16:58:23 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  Don't forget to free url structure
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.17r2=1.62.2.14.2.18diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.17 
php-src/ext/curl/interface.c:1.62.2.14.2.18
--- php-src/ext/curl/interface.c:1.62.2.14.2.17 Tue Dec 26 16:55:56 2006
+++ php-src/ext/curl/interface.cTue Dec 26 16:58:23 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.17 2006/12/26 16:55:56 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.18 2006/12/26 16:58:23 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -175,6 +175,7 @@

\
if (php_memnstr(str, tmp_url-path, strlen(tmp_url-path), str 
+ len)) {\
php_error_docref(NULL TSRMLS_CC, E_WARNING, URL '%s' 
contains unencoded control characters., str);\
+   php_url_free(tmp_url);  

\
php_curl_ret(__ret);
\
}   
\


\

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2006-12-19 Thread Michael Wallner 
mikeTue Dec 19 21:41:25 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: check CRYPTO_get_id_callback() if anyone else already set thread lock 
callbacks
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.15r2=1.62.2.14.2.16diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.15 
php-src/ext/curl/interface.c:1.62.2.14.2.16
--- php-src/ext/curl/interface.c:1.62.2.14.2.15 Tue Nov 21 15:53:23 2006
+++ php-src/ext/curl/interface.cTue Dec 19 21:41:25 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.15 2006/11/21 15:53:23 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.16 2006/12/19 21:41:25 mike Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -614,7 +614,7 @@
 #endif
 
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
-   {
+   if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();

php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
@@ -667,16 +667,11 @@
php_unregister_url_stream_wrapper(ftp TSRMLS_CC);
php_unregister_url_stream_wrapper(ldap TSRMLS_CC);
 #endif
-#ifdef PHP_CURL_NEED_OPENSSL_TSL
-   /* ensure there are valid callbacks set */
-   CRYPTO_set_id_callback(php_curl_ssl_id);
-   CRYPTO_set_locking_callback(php_curl_ssl_lock);
-#endif
curl_global_cleanup();
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (php_curl_openssl_tsl) {
int i, c = CRYPTO_num_locks();
-   
+   
CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL);


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2006-10-08 Thread Ilia Alshanetsky 
iliaa   Sun Oct  8 22:38:48 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  Added missing configuration checks
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.10r2=1.62.2.14.2.11diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.10 
php-src/ext/curl/interface.c:1.62.2.14.2.11
--- php-src/ext/curl/interface.c:1.62.2.14.2.10 Mon Sep 18 16:11:50 2006
+++ php-src/ext/curl/interface.cSun Oct  8 22:38:48 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.10 2006/09/18 16:11:50 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.11 2006/10/08 22:38:48 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -563,9 +563,13 @@
REGISTER_CURL_CONSTANT(CURLE_SSL_CIPHER);
REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT);
REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING);
+#if LIBCURL_VERSION_NUM = 0x070a08
REGISTER_CURL_CONSTANT(CURLE_LDAP_INVALID_URL);
REGISTER_CURL_CONSTANT(CURLE_FILESIZE_EXCEEDED);
+#endif
+#if LIBCURL_VERSION_NUM = 0x070b00
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
+#endif
 
REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c streams.c /ext/standard string.c

2006-08-10 Thread Ilia Alshanetsky 
iliaa   Thu Aug 10 14:40:13 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   string.c 
/php-src/ext/curl   interface.c streams.c 
  Log:
  Fixed overflow on 64bit systems in str_repeat() and wordwrap().
  Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are
  enabled.
  
  # Patches by Stefan E.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.10r2=1.445.2.14.2.11diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.10 
php-src/ext/standard/string.c:1.445.2.14.2.11
--- php-src/ext/standard/string.c:1.445.2.14.2.10   Tue Aug  8 10:22:25 2006
+++ php-src/ext/standard/string.c   Thu Aug 10 14:40:12 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.10 2006/08/08 10:22:25 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.11 2006/08/10 14:40:12 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -634,7 +634,8 @@
 {
const char *text, *breakchar = \n;
char *newtext;
-   int textlen, breakcharlen = 1, newtextlen, alloced, chk;
+   int textlen, breakcharlen = 1, newtextlen, chk;
+   size_t alloced;
long current = 0, laststart = 0, lastspace = 0;
long linelength = 75;
zend_bool docut = 0;
@@ -4265,7 +4266,7 @@
zval**input_str;/* Input string */
zval**mult; /* Multiplier */
char*result;/* Resulting string */
-   int result_len; /* Length of the resulting 
string */
+   size_t  result_len; /* Length of the resulting 
string */

if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, input_str, 
mult) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -4290,11 +4291,7 @@

/* Initialize the result string */  
result_len = Z_STRLEN_PP(input_str) * Z_LVAL_PP(mult);
-   if (result_len  1 || result_len  2147483647) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, You may not create 
strings longer than 2147483647 bytes);
-   RETURN_FALSE;
-   }
-   result = (char *)emalloc(result_len + 1);
+   result = (char *)safe_emalloc(Z_STRLEN_PP(input_str), Z_LVAL_PP(mult), 
1);

/* Heavy optimization for situations where input string is 1 byte long 
*/
if (Z_STRLEN_PP(input_str) == 1) {
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.6r2=1.62.2.14.2.7diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.6 
php-src/ext/curl/interface.c:1.62.2.14.2.7
--- php-src/ext/curl/interface.c:1.62.2.14.2.6  Tue Jul  4 20:12:38 2006
+++ php-src/ext/curl/interface.cThu Aug 10 14:40:13 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.6 2006/07/04 20:12:38 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.7 2006/08/10 14:40:13 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1168,7 +1168,6 @@
case CURLOPT_FTPLISTONLY:
case CURLOPT_FTPAPPEND:
case CURLOPT_NETRC:
-   case CURLOPT_FOLLOWLOCATION:
case CURLOPT_PUT:
 #if CURLOPT_MUTE != 0
 case CURLOPT_MUTE:
@@ -1219,6 +1218,16 @@
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;
+   case CURLOPT_FOLLOWLOCATION:
+   convert_to_long_ex(zvalue);
+   if ((PG(open_basedir)  *PG(open_basedir)) || 
PG(safe_mode)) {
+   if (Z_LVAL_PP(zvalue) != 0) {
+   php_error_docref(NULL TSRMLS_CC, 
E_WARNING, CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an 
open_basedir is set);
+   RETURN_FALSE;
+   }
+   }
+   error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
+   break;
case CURLOPT_URL:
case CURLOPT_PROXY:
case CURLOPT_USERPWD:
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.3r2=1.14.2.2.2.4diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14.2.2.2.3 
php-src/ext/curl/streams.c:1.14.2.2.2.4
--- php-src/ext/curl/streams.c:1.14.2.2.2.3 Tue Aug  1 13:28:03 2006
+++ php-src/ext/curl/streams.c  Thu Aug 10 14:40:13 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.14.2.2.2.3 2006/08/01 13:28:03

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2006-07-04 Thread Ilia Alshanetsky 
iliaa   Tue Jul  4 20:12:38 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  Eliminate some compiler warnings
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.5r2=1.62.2.14.2.6diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.5 
php-src/ext/curl/interface.c:1.62.2.14.2.6
--- php-src/ext/curl/interface.c:1.62.2.14.2.5  Thu Jun 29 14:31:56 2006
+++ php-src/ext/curl/interface.cTue Jul  4 20:12:38 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.5 2006/06/29 14:31:56 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.6 2006/07/04 20:12:38 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1268,11 +1268,13 @@
ZEND_VERIFY_RESOURCE(what);
 
if (FAILURE == php_stream_cast((php_stream *) what, 
PHP_STREAM_AS_STDIO, (void *) fp, REPORT_ERRORS)) {
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   return 1;
}
 
if (!fp) {
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   return 1;
}
 
error = CURLE_OK;
@@ -1367,7 +1369,8 @@
postfields = HASH_OF(*zvalue);
if (! postfields) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Couldn't get HashTable in CURLOPT_POSTFIELDS); 
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   return 1;
}
 
for 
(zend_hash_internal_pointer_reset(postfields);
@@ -1389,7 +1392,8 @@
++postval;
/* safe_mode / open_basedir 
check */
if 
(php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode)  
!php_checkuid(postval, rb+, CHECKUID_CHECK_MODE_PARAM))) {
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   return 1;
}
error = curl_formadd(first, 
last, 

 CURLFORM_COPYNAME, string_key,
@@ -1408,7 +1412,8 @@
 
SAVE_CURL_ERROR(ch, error);
if (error != CURLE_OK) {
-   RETURN_FALSE;
+   RETVAL_FALSE
+   return 1;
}
 
zend_llist_add_element(ch-to_free.post, 
first);
@@ -1436,7 +1441,8 @@
ph = HASH_OF(*zvalue);
if (!ph) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
You must pass either an object or an array with the CURLOPT_HTTPHEADER, 
CURLOPT_QUOTE, CURLOPT_HTTP200ALIASES and CURLOPT_POSTQUOTE arguments);
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   return 1;
}
 
for (zend_hash_internal_pointer_reset(ph);
@@ -1453,7 +1459,8 @@
if (!slist) {
efree(indiv);
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Could not build curl_slist); 
-   RETURN_FALSE;
+   RETVAL_FALSE;
+   return 1;
}
zend_llist_add_element(ch-to_free.str, 
indiv);
}
@@ -1475,7 +1482,8 @@
convert_to_string_ex(zvalue);
 
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) 
TSRMLS_CC) || (PG(safe_mode)  !php_checkuid(Z_STRVAL_PP(zvalue), rb+, 
CHECKUID_CHECK_MODE_PARAM))) {
-   RETURN_FALSE;   
+   RETVAL_FALSE;
+   return 1;
}
 
copystr = estrndup(Z_STRVAL_PP(zvalue), 
Z_STRLEN_PP(zvalue));

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c /ext/standard url.c

2006-06-29 Thread Hannes Magnusson 
bjori   Thu Jun 29 14:31:57 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   url.c 
/php-src/ext/curl   interface.c 
  Log:
  Bug #37961 (url should be URL)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5.2.1r2=1.86.2.5.2.2diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.86.2.5.2.1 
php-src/ext/standard/url.c:1.86.2.5.2.2
--- php-src/ext/standard/url.c:1.86.2.5.2.1 Mon Jun 26 18:48:56 2006
+++ php-src/ext/standard/url.c  Thu Jun 29 14:31:56 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]  
|
+--+
  */
-/* $Id: url.c,v 1.86.2.5.2.1 2006/06/26 18:48:56 bjori Exp $ */
+/* $Id: url.c,v 1.86.2.5.2.2 2006/06/29 14:31:56 bjori Exp $ */
 
 #include stdlib.h
 #include string.h
@@ -344,7 +344,7 @@
 
resource = php_url_parse_ex(str, str_len);
if (resource == NULL) {
-   php_error_docref1(NULL TSRMLS_CC, str, E_WARNING, Unable to 
parse url);
+   php_error_docref1(NULL TSRMLS_CC, str, E_WARNING, Unable to 
parse URL);
RETURN_FALSE;
}
 
@@ -375,7 +375,7 @@
if (resource-fragment != NULL) 
RETVAL_STRING(resource-fragment, 1);
break;
default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Invalid url component identifier %ld., key);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Invalid URL component identifier %ld., key);
RETVAL_FALSE;
}
goto done;
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.4r2=1.62.2.14.2.5diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.4 
php-src/ext/curl/interface.c:1.62.2.14.2.5
--- php-src/ext/curl/interface.c:1.62.2.14.2.4  Mon Jun 26 14:11:17 2006
+++ php-src/ext/curl/interface.cThu Jun 29 14:31:56 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.4 2006/06/26 14:11:17 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.5 2006/06/29 14:31:56 bjori Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -163,12 +163,12 @@
php_url *tmp_url;   

\

\
if (!(tmp_url = php_url_parse_ex(str, len))) {  
\
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
url '%s', str);   \
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
URL '%s', str);   \
RETURN_FALSE;   

\
}   

\

\
if (php_memnstr(str, tmp_url-path, strlen(tmp_url-path), str 
+ len)) {\
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Url '%s' 
contains unencoded control characters., str);\
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, URL '%s' 
contains unencoded control characters., str);\
RETURN_FALSE;   
\
}   
\


\

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c /ext/gmp gmp.c /ext/libxml libxml.c

2006-06-26 Thread Hannes Magnusson 
bjori   Mon Jun 26 14:11:18 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c 
/php-src/ext/curl   interface.c 
/php-src/ext/gmpgmp.c 
  Log:
  MFH: Removed obsolete arginfo include
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.3r2=1.32.2.7.2.4diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.3 
php-src/ext/libxml/libxml.c:1.32.2.7.2.4
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.3Sat Jun 17 13:06:06 2006
+++ php-src/ext/libxml/libxml.c Mon Jun 26 14:11:17 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.32.2.7.2.3 2006/06/17 13:06:06 bjori Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.4 2006/06/26 14:11:17 bjori Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -68,9 +68,6 @@
 /* {{{ dynamically loadable module stuff */
 #ifdef COMPILE_DL_LIBXML
 ZEND_GET_MODULE(libxml)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
 #endif /* COMPILE_DL_LIBXML */
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.3r2=1.62.2.14.2.4diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.3 
php-src/ext/curl/interface.c:1.62.2.14.2.4
--- php-src/ext/curl/interface.c:1.62.2.14.2.3  Thu Jun 15 15:31:54 2006
+++ php-src/ext/curl/interface.cMon Jun 26 14:11:17 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.3 2006/06/15 15:31:54 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.4 2006/06/26 14:11:17 bjori Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -325,9 +325,6 @@
 
 #ifdef COMPILE_DL_CURL
 ZEND_GET_MODULE (curl)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
 #endif
 
 /* {{{ PHP_MINFO_FUNCTION
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.3r2=1.49.2.2.2.4diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.3 php-src/ext/gmp/gmp.c:1.49.2.2.2.4
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.3  Fri Jun 16 00:14:35 2006
+++ php-src/ext/gmp/gmp.c   Mon Jun 26 14:11:17 2006
@@ -333,9 +333,6 @@
 
 #ifdef COMPILE_DL_GMP
 ZEND_GET_MODULE(gmp)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
 #endif
 
 static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php