subject:"\[PHP\-CVS\] cvs\: php4 \/ext\/curl interface.c"

[PHP-CVS] cvs: php4 /ext/curl interface.c

2003-06-19 Thread Ilia Alshanetsky

iliaa   Thu Jun 19 18:12:21 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  Added missing safe_mode checks.
  Added support for additional libcurl options.
  Set CURLOPT_NOSIGNAL by default for ZTS, for signal free operation.
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.21 php4/ext/curl/interface.c:1.22
--- php4/ext/curl/interface.c:1.21  Wed Jun 18 17:02:02 2003
+++ php4/ext/curl/interface.c   Thu Jun 19 18:12:21 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.21 2003/06/18 21:02:02 sterling Exp $ */
+/* $Id: interface.c,v 1.22 2003/06/19 22:12:21 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -201,8 +201,26 @@
REGISTER_CURL_CONSTANT(CURLOPT_SSLKEYPASSWD);
REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE);
REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE_DEFAULT);
+   REGISTER_CURL_CONSTANT(CURLOPT_SSLCERTTYPE);
REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);
+   REGISTER_CURL_CONSTANT(CURLOPT_PROXYPORT);
+   REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
+   REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
+   REGISTER_CURL_CONSTANT(CURLOPT_UNRESTRICTED_AUTH);
+   REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT);
+   REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
+
+#ifdef CURLOPT_HTTPAUTH /* only in curl 7.10.6 */
+   REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
+   /* http authentication options */
+   REGISTER_CURL_CONSTANT(CURLHTTP_BASIC);
+   REGISTER_CURL_CONSTANT(CURLHTTP_DIGEST);
+   REGISTER_CURL_CONSTANT(CURLHTTP_GSSNEGOTIATE);
+   REGISTER_CURL_CONSTANT(CURLHTTP_NTLM);
+   REGISTER_CURL_CONSTANT(CURLHTTP_ANY);
+   REGISTER_CURL_CONSTANT(CURLHTTP_ANYSAFE);
+#endif

/* Constants effecting the way CURLOPT_CLOSEPOLICY works */
REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
@@ -699,6 +717,9 @@
curl_easy_setopt(ch-cp, CURLOPT_WRITEHEADER,   (void *) ch);
curl_easy_setopt(ch-cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
curl_easy_setopt(ch-cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
+#if defined(ZTS)
+   curl_easy_setopt(ch-cp, CURLOPT_NOSIGNAL, 1);
+#endif
 
if (argc  0) {
char *urlcopy;
@@ -773,6 +794,13 @@
case CURLOPT_HTTPGET:
case CURLOPT_HTTP_VERSION:
case CURLOPT_CRLF:
+   case CURLOPT_DNS_CACHE_TIMEOUT:
+   case CURLOPT_PROXYPORT:
+   case CURLOPT_FTP_USE_EPRT:
+#ifdef CURLOPT_HTTPAUTH /* only in curl 7.10.6 */
+   case CURLOPT_HTTPAUTH:
+#endif
+   case CURLOPT_UNRESTRICTED_AUTH:
case CURLOPT_PORT:
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue));
@@ -786,22 +814,19 @@
case CURLOPT_USERAGENT:
case CURLOPT_FTPPORT:
case CURLOPT_COOKIE:
-   case CURLOPT_COOKIEFILE:
case CURLOPT_REFERER:
case CURLOPT_INTERFACE:
case CURLOPT_KRB4LEVEL: 
-   case CURLOPT_RANDOM_FILE:
case CURLOPT_EGDSOCKET:
case CURLOPT_CAINFO: 
case CURLOPT_CAPATH:
-   case CURLOPT_COOKIEJAR:
case CURLOPT_SSL_CIPHER_LIST: 
case CURLOPT_SSLKEY:
-   case CURLOPT_SSLCERT:
case CURLOPT_SSLKEYTYPE: 
case CURLOPT_SSLKEYPASSWD: 
case CURLOPT_SSLENGINE: 
case CURLOPT_SSLENGINE_DEFAULT:
+   case CURLOPT_SSLCERTTYPE:
case CURLOPT_ENCODING: {
char *copystr = NULL;

@@ -969,6 +994,7 @@
break;
case CURLOPT_HTTPHEADER: 
case CURLOPT_QUOTE:
+   case CURLOPT_HTTP200ALIASES:
case CURLOPT_POSTQUOTE: {
zval  **current;
HashTable  *ph;
@@ -976,7 +1002,7 @@
 
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 and 
CURLOPT_POSTQUOTE arguments);
+   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;
}
 
@@ -1001,6 +1027,28 @@
zend_llist_add_element(ch-to_free.slist, slist);
 
error = curl_easy_setopt(ch-cp, option, slist);
+
+

[PHP-CVS] cvs: php4 /ext/curl interface.c php_curl.h streams.c

2003-06-19 Thread Edin Kadribasic

edink   Thu Jun 19 19:07:14 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c php_curl.h streams.c 
  Log:
  Win32 build fixes
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.22 php4/ext/curl/interface.c:1.23
--- php4/ext/curl/interface.c:1.22  Thu Jun 19 18:12:21 2003
+++ php4/ext/curl/interface.c   Thu Jun 19 19:07:14 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.22 2003/06/19 22:12:21 iliaa Exp $ */
+/* $Id: interface.c,v 1.23 2003/06/19 23:07:14 edink Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -55,6 +55,8 @@
 #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1);
 #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
 
+static const unsigned char second_args_force_ref[]= { 2, BYREF_NONE, BYREF_FORCE 
};
+
 /* {{{ curl_functions[]
  */
 function_entry curl_functions[] = {
@@ -70,7 +72,7 @@
PHP_FE(curl_multi_add_handle,NULL)
PHP_FE(curl_multi_remove_handle, NULL)
PHP_FE(curl_multi_select,NULL)
-   PHP_FE(curl_multi_exec,  second_arg_force_ref)
+   PHP_FE(curl_multi_exec,  second_args_force_ref)
PHP_FE(curl_multi_getcontent,NULL)
PHP_FE(curl_multi_info_read, NULL)
PHP_FE(curl_multi_close, NULL)
Index: php4/ext/curl/php_curl.h
diff -u php4/ext/curl/php_curl.h:1.34 php4/ext/curl/php_curl.h:1.35
--- php4/ext/curl/php_curl.h:1.34   Tue Jun 10 16:03:26 2003
+++ php4/ext/curl/php_curl.hThu Jun 19 19:07:14 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_curl.h,v 1.34 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: php_curl.h,v 1.35 2003/06/19 23:07:14 edink Exp $ */
 
 #ifndef _PHP_CURL_H
 #define _PHP_CURL_H
@@ -131,10 +131,10 @@
 
 /* streams support */
 
-PHPAPI extern php_stream_ops php_curl_stream_ops;
+extern php_stream_ops php_curl_stream_ops;
 #define PHP_STREAM_IS_CURL php_curl_stream_ops
 
-PHPAPI php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char 
*filename, char *mode,
+php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, char 
*mode,
int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC);
 
 extern php_stream_wrapper php_curl_wrapper;
Index: php4/ext/curl/streams.c
diff -u php4/ext/curl/streams.c:1.7 php4/ext/curl/streams.c:1.8
--- php4/ext/curl/streams.c:1.7 Tue Jun 10 16:03:26 2003
+++ php4/ext/curl/streams.c Thu Jun 19 19:07:14 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.7 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: streams.c,v 1.8 2003/06/19 23:07:14 edink Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -232,7 +232,7 @@
return php_stream_cast(curlstream-readbuffer.buf, castas, ret, 0);
 }
 
-PHPAPI php_stream_ops php_curl_stream_ops = {
+php_stream_ops php_curl_stream_ops = {
php_curl_stream_write,
php_curl_stream_read,
php_curl_stream_close,
@@ -244,7 +244,7 @@
 };
 
 
-PHPAPI php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char 
*filename, char *mode,
+php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, char 
*mode,
int options, char **opened_path, php_stream_context *context 
STREAMS_DC TSRMLS_DC)
 {
php_stream *stream;



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

[PHP-CVS] cvs: php4 /ext/curl interface.c

2003-06-18 Thread Sterling Hughes

sterlingWed Jun 18 17:02:02 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  recognize CURLOPT_PORT
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.20 php4/ext/curl/interface.c:1.21
--- php4/ext/curl/interface.c:1.20  Thu Jun 12 08:32:22 2003
+++ php4/ext/curl/interface.c   Wed Jun 18 17:02:02 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.20 2003/06/12 12:32:22 andrey Exp $ */
+/* $Id: interface.c,v 1.21 2003/06/18 21:02:02 sterling Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -773,6 +773,7 @@
case CURLOPT_HTTPGET:
case CURLOPT_HTTP_VERSION:
case CURLOPT_CRLF:
+   case CURLOPT_PORT:
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

Re: [PHP-CVS] cvs: php4 /ext/curl interface.c

2003-06-18 Thread Jani Taskinen


Since what curl version is that available?
MFH? :)

--Jani


On Wed, 18 Jun 2003, Sterling Hughes wrote:

sterling   Wed Jun 18 17:02:02 2003 EDT

  Modified files:  
/php4/ext/curl interface.c 
  Log:
  recognize CURLOPT_PORT
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.20 php4/ext/curl/interface.c:1.21
--- php4/ext/curl/interface.c:1.20 Thu Jun 12 08:32:22 2003
+++ php4/ext/curl/interface.c  Wed Jun 18 17:02:02 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.20 2003/06/12 12:32:22 andrey Exp $ */
+/* $Id: interface.c,v 1.21 2003/06/18 21:02:02 sterling Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -773,6 +773,7 @@
   case CURLOPT_HTTPGET:
   case CURLOPT_HTTP_VERSION:
   case CURLOPT_CRLF:
+  case CURLOPT_PORT:
   convert_to_long_ex(zvalue);
   error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue));
   break;





-- 
https://www.paypal.com/xclick/[EMAIL PROTECTED]no_note=1tax=0currency_code=EUR
 


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

[PHP-CVS] cvs: php4 /ext/curl interface.c

2003-06-12 Thread Andrey Hristov

andrey  Thu Jun 12 08:32:22 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  proto fix
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.19 php4/ext/curl/interface.c:1.20
--- php4/ext/curl/interface.c:1.19  Tue Jun 10 16:03:26 2003
+++ php4/ext/curl/interface.c   Thu Jun 12 08:32:22 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.19 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: interface.c,v 1.20 2003/06/12 12:32:22 andrey Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1070,7 +1070,7 @@
 }
 /* }}} */
 
-/* {{{ proto string curl_getinfo(resource ch, int opt)
+/* {{{ proto mixed curl_getinfo(resource ch, int opt)
Get information regarding a specific transfer */
 PHP_FUNCTION(curl_getinfo)
 {



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

[PHP-CVS] cvs: php4 /ext/curl interface.c multi.c streams.c

2003-03-17 Thread Jani Taskinen

sniper  Mon Mar 17 10:06:11 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c multi.c streams.c 
  Log:
  WS  CS fixes
  Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.11 php4/ext/curl/interface.c:1.12
--- php4/ext/curl/interface.c:1.11  Thu Mar 13 13:15:31 2003
+++ php4/ext/curl/interface.c   Mon Mar 17 10:06:11 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.11 2003/03/13 18:15:31 iliaa Exp $ */
+/* $Id: interface.c,v 1.12 2003/03/17 15:06:11 sniper Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -369,51 +369,46 @@
 
 #if PHP_CURL_DEBUG
fprintf(stderr, curl_write() called\n);
-   fprintf(stderr, data = %s, size = %d, nmemb = %d, ctx = %x\n, 
-   data, size, nmemb, ctx);
+   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, size);
-   break;
-   case PHP_CURL_FILE:
-   return fwrite(data, size, nmemb, t-fp);
-   case PHP_CURL_RETURN:
-   smart_str_appendl(t-buf, data, (int) length);
-   break;
-   case PHP_CURL_USER: {
-   zval *argv[2];
-   zval *retval;
-   int   error;
-   TSRMLS_FETCH();
-
-   MAKE_STD_ZVAL(argv[0]);
-   MAKE_STD_ZVAL(argv[1]);
-   MAKE_STD_ZVAL(retval);
-
-   ZVAL_RESOURCE(argv[0], ch-id);
-   zend_list_addref(ch-id);
-   ZVAL_STRINGL(argv[1], data, length, 1);
-
-   error = call_user_function(EG(function_table),
-  NULL,
-  t-func,
-  retval, 2, argv TSRMLS_CC);
-   if (error == FAILURE) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't call the 
CURLOPT_WRITEFUNCTION);
-   length = -1;
-   }
-   else {
-   length = Z_LVAL_P(retval);
-   }
-
-   zval_ptr_dtor(argv[0]);
-   zval_ptr_dtor(argv[1]);
-   zval_ptr_dtor(retval);
+   case PHP_CURL_STDOUT:
+   PHPWRITE(data, size);
+   break;
+   case PHP_CURL_FILE:
+   return fwrite(data, size, nmemb, t-fp);
+   case PHP_CURL_RETURN:
+   smart_str_appendl(t-buf, data, (int) length);
+   break;
+   case PHP_CURL_USER: {
+   zval *argv[2];
+   zval *retval;
+   int   error;
+   TSRMLS_FETCH();
 
-   break;
-   }
+   MAKE_STD_ZVAL(argv[0]);
+   MAKE_STD_ZVAL(argv[1]);
+   MAKE_STD_ZVAL(retval);
+
+   ZVAL_RESOURCE(argv[0], ch-id);
+   zend_list_addref(ch-id);
+   ZVAL_STRINGL(argv[1], data, length, 1);
+
+   error = call_user_function(EG(function_table), NULL, t-func, 
retval, 2, argv TSRMLS_CC);
+
+   if (error == FAILURE) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not 
call the CURLOPT_WRITEFUNCTION);
+   length = -1;
+   } else {
+   length = Z_LVAL_P(retval);
+   }
+
+   zval_ptr_dtor(argv[0]);
+   zval_ptr_dtor(argv[1]);
+   zval_ptr_dtor(retval);
+   break;
+   }
}
 
return length;
@@ -429,48 +424,44 @@
int length = -1;
 
switch (t-method) {
-   case PHP_CURL_DIRECT:
-   if (t-fp) {
-   length = fread(data, size, nmemb, t-fp);
-   }
-   break;
-   case PHP_CURL_USER: {
-   zval *argv[3];
-   zval *retval;
-   int   length;
-   int   error;
-   TSRMLS_FETCH();
-
-   MAKE_STD_ZVAL(argv[0]);
-   MAKE_STD_ZVAL(argv[1]);
-   MAKE_STD_ZVAL(argv[2]);
-   MAKE_STD_ZVAL(retval);
-
-   ZVAL_RESOURCE(argv[0], ch-id);
-   zend_list_addref(ch-id);
-   ZVAL_RESOURCE(argv[1], t-fd);
-   zend_list_addref(t-fd);
-   ZVAL_LONG(argv[2], (int) size * nmemb);
-
-   error = call_user_function(EG(function_table),
-  NULL,
-  t-func,
-  retval, 3, argv

[PHP-CVS] cvs: php4 /ext/curl interface.c

2003-03-13 Thread Ilia Alshanetsky

iliaa   Thu Mar 13 13:15:31 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  Fixed bug #22681 (Crash when reading from invalid file pointer).
   
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.10 php4/ext/curl/interface.c:1.11
--- php4/ext/curl/interface.c:1.10  Fri Feb 28 02:34:45 2003
+++ php4/ext/curl/interface.c   Thu Mar 13 13:15:31 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.10 2003/02/28 07:34:45 sniper Exp $ */
+/* $Id: interface.c,v 1.11 2003/03/13 18:15:31 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -430,7 +430,9 @@
 
switch (t-method) {
case PHP_CURL_DIRECT:
-   length = fread(data, size, nmemb, t-fp);
+   if (t-fp) {
+   length = fread(data, size, nmemb, t-fp);
+   }
break;
case PHP_CURL_USER: {
zval *argv[3];



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

[PHP-CVS] cvs: php4 /ext/curl interface.c

2003-02-27 Thread Jani Taskinen

sniper  Fri Feb 28 02:34:46 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  - Fixed bug #22312 (crash on failed connection when curl_getinfo() was called).
(Phil Oleson [EMAIL PROTECTED])
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.9 php4/ext/curl/interface.c:1.10
--- php4/ext/curl/interface.c:1.9   Tue Feb 25 02:19:44 2003
+++ php4/ext/curl/interface.c   Fri Feb 28 02:34:45 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.9 2003/02/25 07:19:44 sniper Exp $ */
+/* $Id: interface.c,v 1.10 2003/02/28 07:34:45 sniper Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1101,46 +1101,68 @@
 
array_init(return_value);
 
-   curl_easy_getinfo(ch-cp, CURLINFO_EFFECTIVE_URL, s_code);
-   CAAS(url, s_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_CONTENT_TYPE, s_code);
-   CAAS(content_type, s_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_HTTP_CODE, l_code);
-   CAAL(http_code, l_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_HEADER_SIZE, l_code);
-   CAAL(header_size, l_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_REQUEST_SIZE, l_code);
-   CAAL(request_size, l_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_FILETIME, l_code);
-   CAAL(filetime, l_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_SSL_VERIFYRESULT, l_code);
-   CAAL(ssl_verify_result, l_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_REDIRECT_COUNT, l_code);
-   CAAL(redirect_count, l_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_TOTAL_TIME, d_code);
-   CAAD(total_time, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_NAMELOOKUP_TIME, d_code);
-   CAAD(namelookup_time, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_CONNECT_TIME, d_code);
-   CAAD(connect_time, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_PRETRANSFER_TIME, d_code);
-   CAAD(pretransfer_time, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_SIZE_UPLOAD, d_code);
-   CAAD(size_upload, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_SIZE_DOWNLOAD, d_code);
-   CAAD(size_download, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_SPEED_DOWNLOAD, d_code);
-   CAAD(speed_download, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_SPEED_UPLOAD, d_code);
-   CAAD(speed_upload, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_CONTENT_LENGTH_DOWNLOAD, d_code);
-   CAAD(download_content_length, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_CONTENT_LENGTH_UPLOAD, d_code);
-   CAAD(upload_content_length, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_STARTTRANSFER_TIME, d_code);
-   CAAD(starttransfer_time, d_code);
-   curl_easy_getinfo(ch-cp, CURLINFO_REDIRECT_TIME, d_code);
-   CAAD(redirect_time, d_code);
+   if (curl_easy_getinfo(ch-cp, CURLINFO_EFFECTIVE_URL, s_code) == 
CURLE_OK) {
+   CAAS(url, s_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_CONTENT_TYPE, s_code) == 
CURLE_OK) {
+   if (s_code != NULL) {
+   CAAS(content_type, s_code);
+   }
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_HTTP_CODE, l_code) == 
CURLE_OK) {
+   CAAL(http_code, l_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_HEADER_SIZE, l_code) == 
CURLE_OK) {
+   CAAL(header_size, l_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_REQUEST_SIZE, l_code) == 
CURLE_OK) {
+   CAAL(request_size, l_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_FILETIME, l_code) == CURLE_OK) 
{
+   CAAL(filetime, l_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_SSL_VERIFYRESULT, l_code) == 
CURLE_OK) {
+   CAAL(ssl_verify_result, l_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_REDIRECT_COUNT, l_code) == 
CURLE_OK) {
+   CAAL(redirect_count, l_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_TOTAL_TIME, d_code) == 
CURLE_OK) {
+   CAAD(total_time, d_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_NAMELOOKUP_TIME, d_code) == 
CURLE_OK) {
+   CAAD(namelookup_time, d_code);
+   }
+   if (curl_easy_getinfo(ch-cp, CURLINFO_CONNECT_TIME, d_code) == 
CURLE_OK) {
+

[PHP-CVS] cvs: php4 /ext/curl interface.c multi.c

2003-02-24 Thread Jani Taskinen

sniper  Tue Feb 25 02:19:44 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c multi.c 
  Log:
  (hope) fix some win32 build errors
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.8 php4/ext/curl/interface.c:1.9
--- php4/ext/curl/interface.c:1.8   Sat Feb 15 22:48:43 2003
+++ php4/ext/curl/interface.c   Tue Feb 25 02:19:44 2003
@@ -16,7 +16,9 @@
+--+
 */
 
-/* $Id: interface.c,v 1.8 2003/02/16 03:48:43 wez Exp $ */
+/* $Id: interface.c,v 1.9 2003/02/25 07:19:44 sniper Exp $ */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -43,8 +45,6 @@
 #include ext/standard/info.h
 #include ext/standard/file.h
 #include php_curl.h
-
-static unsigned char second_arg_force_ref[] = {2, BYREF_NONE, BYREF_FORCE};
 
 static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 
Index: php4/ext/curl/multi.c
diff -u php4/ext/curl/multi.c:1.4 php4/ext/curl/multi.c:1.5
--- php4/ext/curl/multi.c:1.4   Tue Dec 31 11:06:21 2002
+++ php4/ext/curl/multi.c   Tue Feb 25 02:19:44 2003
@@ -16,7 +16,9 @@
+--+
 */
 
-/* $Id: */ 
+/* $Id: multi.c,v 1.5 2003/02/25 07:19:44 sniper Exp $ */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include php.h
 
@@ -27,10 +29,21 @@
 #include curl/curl.h
 #include curl/multi.h
 
+#ifdef HAVE_SYS_SELECT_H
 #include sys/select.h
+#endif
+
+#ifdef HAVE_SYS_TIME_H
 #include sys/time.h
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
 #include sys/types.h
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include unistd.h
+#endif
 
 /* {{{ proto resource curl_multi_init(void)
Returns a new cURL multi handle */



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

[PHP-CVS] cvs: php4 /ext/curl interface.c

2003-02-03 Thread Ilia Alshanetsky

iliaa   Mon Feb  3 15:56:24 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  Fixed bug #22031 (Made curl_write()  curl_write_header() binary safe).
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.6 php4/ext/curl/interface.c:1.7
--- php4/ext/curl/interface.c:1.6   Sun Feb  2 15:56:51 2003
+++ php4/ext/curl/interface.c   Mon Feb  3 15:56:23 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.6 2003/02/02 20:56:51 iliaa Exp $ */
+/* $Id: interface.c,v 1.7 2003/02/03 20:56:23 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -375,7 +375,7 @@

switch (t-method) {
case PHP_CURL_STDOUT:
-   PUTS(data);
+   PHPWRITE(data, size);
break;
case PHP_CURL_FILE:
return fwrite(data, size, nmemb, t-fp);
@@ -491,7 +491,7 @@
if (ch-handlers-write-method == PHP_CURL_RETURN)
smart_str_appendl(ch-handlers-write-buf, data, 
(int) length);
else
-   PUTS(data);
+   PHPWRITE(data, size);
break;
case PHP_CURL_FILE:
return fwrite(data, size, nmemb, t-fp);



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

[PHP-CVS] cvs: php4 /ext/curl interface.c

2003-02-02 Thread Ilia Alshanetsky

iliaa   Sun Feb  2 15:56:51 2003 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  Gave the user the ability to specify encoding of the request.
  Patch by [EMAIL PROTECTED]
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.5 php4/ext/curl/interface.c:1.6
--- php4/ext/curl/interface.c:1.5   Sat Jan 18 16:31:04 2003
+++ php4/ext/curl/interface.c   Sun Feb  2 15:56:51 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.5 2003/01/18 21:31:04 iliaa Exp $ */
+/* $Id: interface.c,v 1.6 2003/02/02 20:56:51 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -202,6 +202,7 @@
REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE);
REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE_DEFAULT);
REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
+   REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);

/* Constants effecting the way CURLOPT_CLOSEPOLICY works */
REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
@@ -805,7 +806,8 @@
case CURLOPT_SSLKEYTYPE: 
case CURLOPT_SSLKEYPASSWD: 
case CURLOPT_SSLENGINE: 
-   case CURLOPT_SSLENGINE_DEFAULT: {
+   case CURLOPT_SSLENGINE_DEFAULT:
+   case CURLOPT_ENCODING: {
char *copystr = NULL;

convert_to_string_ex(zvalue);



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

[PHP-CVS] cvs: php4 /ext/curl interface.c

2002-12-21 Thread Ilia Alshanetsky

iliaa   Sat Dec 21 13:03:47 2002 EDT

  Modified files:  
/php4/ext/curl  interface.c 
  Log:
  Fixed bug #20987 (no handling for client certificates).
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.2 php4/ext/curl/interface.c:1.3
--- php4/ext/curl/interface.c:1.2   Thu Nov 14 06:41:24 2002
+++ php4/ext/curl/interface.c   Sat Dec 21 13:03:46 2002
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.2 2002/11/14 11:41:24 wez Exp $ */
+/* $Id: interface.c,v 1.3 2002/12/21 18:03:46 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -805,6 +805,7 @@
case CURLOPT_COOKIEJAR:
case CURLOPT_SSL_CIPHER_LIST: 
case CURLOPT_SSLKEY:
+   case CURLOPT_SSLCERT:
case CURLOPT_SSLKEYTYPE: 
case CURLOPT_SSLKEYPASSWD: 
case CURLOPT_SSLENGINE: 



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

[PHP-CVS] cvs: php4 /ext/curl interface.c streams.c

2002-11-14 Thread Wez Furlong

wez Thu Nov 14 06:41:24 2002 EDT

  Modified files:  
/php4/ext/curl  interface.c streams.c 
  Log:
  Commit these before Sterling renames the files again :-)
  When curlstreams are enabled, registers a each supported protocol
  with PHP.
  More Correctly implement eof for curlstreams.
  Still not ready for anything like primetime.
  
  
Index: php4/ext/curl/interface.c
diff -u php4/ext/curl/interface.c:1.1 php4/ext/curl/interface.c:1.2
--- php4/ext/curl/interface.c:1.1   Wed Nov 13 17:25:33 2002
+++ php4/ext/curl/interface.c   Thu Nov 14 06:41:24 2002
 -16,7 +16,7 
+--+
 */
 
-/* $Id: interface.c,v 1.1 2002/11/13 22:25:33 sterling Exp $ */
+/* $Id: interface.c,v 1.2 2002/11/14 11:41:24 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
 -320,10 +320,21 
}
 
 #ifdef PHP_CURL_URL_WRAPPERS
+# if HAVE_CURL_VERSION_INFO
+   {
+   curl_version_info_data *info = curl_version_info(CURLVERSION_NOW);
+   char **p = (char **)info-protocols;
+
+   while (*p != NULL) {
+   php_register_url_stream_wrapper(*p++, php_curl_wrapper 
+TSRMLS_CC);
+   }
+   }
+# else
php_register_url_stream_wrapper(http, php_curl_wrapper TSRMLS_CC);
php_register_url_stream_wrapper(https, php_curl_wrapper TSRMLS_CC);
php_register_url_stream_wrapper(ftp, php_curl_wrapper TSRMLS_CC);
php_register_url_stream_wrapper(ldap, php_curl_wrapper TSRMLS_CC);
+# endif
 #endif

return SUCCESS;
Index: php4/ext/curl/streams.c
diff -u php4/ext/curl/streams.c:1.1 php4/ext/curl/streams.c:1.2
--- php4/ext/curl/streams.c:1.1 Wed Nov 13 17:25:33 2002
+++ php4/ext/curl/streams.c Thu Nov 14 06:41:24 2002
 -16,7 +16,7 
+--+
 */
 
-/* $Id: streams.c,v 1.1 2002/11/13 22:25:33 sterling Exp $ */
+/* $Id: streams.c,v 1.2 2002/11/14 11:41:24 wez Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
 -140,18 +140,6 
 {
php_curl_stream *curlstream = (php_curl_stream*)stream-abstract;
size_t didread = 0;
-
-   if (buf == NULL  count == 0) {
-   /* check for EOF */
-
-   /* if we have buffered data, then we are not at EOF */
-   if (curlstream-readbuffer.writepos  0
-curlstream-readbuffer.readpos  
curlstream-readbuffer.writepos)
-   return 0;
-   
-
-   return curlstream-pending ? 0 : EOF;
-   }

if (curlstream-readbuffer.readpos = curlstream-readbuffer.writepos  
curlstream-pending) {
/* we need to read some more data */
 -198,6 +186,11 
curlstream-readbuffer.readpos = 
php_stream_tell(curlstream-readbuffer.buf);
 
}
+
+   if (didread == 0) {
+   stream-eof = 1;
+   }
+   
return didread;
 }
 



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

[PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c php_curl.h streams.c

[PHP-CVS] cvs: php4 /ext/curl interface.c

Re: [PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c multi.c streams.c

[PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c multi.c

[PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c

[PHP-CVS] cvs: php4 /ext/curl interface.c streams.c

13 matches

Site Navigation

Mail list logo

Footer information