subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_3\) \/ext\/curl interface.c"

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

2009-06-28 Thread Pierre-Alain Joye

pajoye  Sun Jun 28 09:50:14 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.57r2=1.62.2.14.2.27.2.58diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.57 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.58
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.57Mon Jun 15 12:37:37 2009
+++ php-src/ext/curl/interface.cSun Jun 28 09:50:14 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.57 2009/06/15 12:37:37 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.58 2009/06/28 09:50:14 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -2052,6 +2052,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_3) /ext/curl interface.c

2009-06-15 Thread Ilia Alshanetsky

iliaa   Mon Jun 15 12:37:37 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  Simplify original fix for bug #33475
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.56r2=1.62.2.14.2.27.2.57diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.56 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.57
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.56Fri Jun 12 20:48:28 2009
+++ php-src/ext/curl/interface.cMon Jun 15 12:37:37 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.56 2009/06/12 20:48:28 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.57 2009/06/15 12:37:37 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -2047,14 +2047,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_3) /ext/curl interface.c /ext/curl/tests bug48514.phpt

2009-06-12 Thread Felipe Pena

felipe  Fri Jun 12 20:48:28 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/curl/tests bug48514.phpt 

  Modified files:  
/php-src/ext/curl   interface.c 
  Log:
  - MFH: Fixed bug #48514 (cURL extension uses same resource name for simple 
and multi APIs)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.55r2=1.62.2.14.2.27.2.56diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.55 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.56
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.55Thu Jun 11 09:46:43 2009
+++ php-src/ext/curl/interface.cFri Jun 12 20:48:28 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.55 2009/06/11 09:46:43 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.56 2009/06/12 20:48:28 felipe Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -456,7 +456,7 @@
 PHP_MINIT_FUNCTION(curl)
 {
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);
+   le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl_multi, 
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

http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?view=markuprev=1.1
Index: php-src/ext/curl/tests/bug48514.phpt
+++ php-src/ext/curl/tests/bug48514.phpt
--TEST--
Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
--FILE--
?php

$ch1 = curl_init();
var_dump($ch1);
var_dump(get_resource_type($ch1));

$ch2 = curl_multi_init();
var_dump($ch2);
var_dump(get_resource_type($ch2));

?
--EXPECTF--
resource(4) of type (curl)
%string|unicode%(4) curl
resource(5) of type (curl_multi)
%string|unicode%(10) curl_multi



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

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

2009-06-11 Thread Antony Dovgal

tony2001Thu Jun 11 09:44:00 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  reapply the fix
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.53r2=1.62.2.14.2.27.2.54diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.53 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.54
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.53Wed Jun 10 11:53:58 2009
+++ php-src/ext/curl/interface.cThu Jun 11 09:43:59 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.53 2009/06/10 11:53:58 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.54 2009/06/11 09:43:59 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -278,7 +278,7 @@
 
 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()
 
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)



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

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

2009-06-11 Thread Antony Dovgal

tony2001Thu Jun 11 09:46:43 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  MFH: fix bug #48518 (curl crashes when writing into invalid file handle)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.54r2=1.62.2.14.2.27.2.55diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.54 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.55
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.54Thu Jun 11 09:43:59 2009
+++ php-src/ext/curl/interface.cThu Jun 11 09:46:43 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.54 2009/06/11 09:43:59 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.55 2009/06/11 09:46:43 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1650,6 +1650,7 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)-mode[0] != 
'r') {
+   
zend_list_addref(Z_LVAL_PP(zvalue));
ch-handlers-write-fp = fp;
ch-handlers-write-method = 
PHP_CURL_FILE;
} else {
@@ -1660,6 +1661,7 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)-mode[0] != 
'r') {
+   
zend_list_addref(Z_LVAL_PP(zvalue));
ch-handlers-write_header-fp 
= fp;

ch-handlers-write_header-method = PHP_CURL_FILE;
} 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_3) /ext/curl interface.c

2009-06-10 Thread Antony Dovgal

tony2001Wed Jun 10 11:10:01 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.51r2=1.62.2.14.2.27.2.52diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.51 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.52
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.51Wed May 27 22:35:26 2009
+++ php-src/ext/curl/interface.cWed Jun 10 11:10:01 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.51 2009/05/27 22:35:26 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.52 2009/06/10 11:10:01 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -278,7 +278,7 @@
 
 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()
 
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)



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

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

2009-06-10 Thread Antony Dovgal

tony2001Wed Jun 10 11:53:58 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  revert the fix for a while
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.52r2=1.62.2.14.2.27.2.53diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.52 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.53
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.52Wed Jun 10 11:10:01 2009
+++ php-src/ext/curl/interface.cWed Jun 10 11:53:58 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.52 2009/06/10 11:10:01 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.53 2009/06/10 11:53:58 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -278,7 +278,7 @@
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_info_read, 0, 0, 1)
ZEND_ARG_INFO(0, mh)
-   ZEND_ARG_INFO(1, msgs_in_queue)
+   ZEND_ARG_INFO(0, msgs_in_queue)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)



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

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

2009-06-10 Thread Lukas Kahwe Smith



On 10.06.2009, at 13:10, Antony Dovgal wrote:


tony2001Wed Jun 10 11:10:01 2009 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/curlinterface.c
 Log:
 MFH: fix arginfo for curl_multi_info_read()



Please revert. We are in a commit freeze for the 5_3 branch as  
announced last week and this week again. Thx.
As always, if you want someone to remind you of a merge because of a  
commit freeze, just let me know and I will remind you once the freeze  
is over.


Its really not about how obvious the bug fix is. We all know that we  
all also make obvious mistakes at time and its just really ver  
inconvenient if we have such stuff during the final build testing  
right before an RC.


regards,
Lukas Kahwe Smith
m...@pooteeweet.org




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

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

2009-06-10 Thread Jani Taskinen

If you're so anal about this, you better keep very good track on what does NOT 
get merged to what branch because of this freeze of yours.


--Jani

Lukas Kahwe Smith kirjoitti:


On 10.06.2009, at 13:10, Antony Dovgal wrote:


tony2001Wed Jun 10 11:10:01 2009 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/curlinterface.c
 Log:
 MFH: fix arginfo for curl_multi_info_read()



Please revert. We are in a commit freeze for the 5_3 branch as announced 
last week and this week again. Thx.
As always, if you want someone to remind you of a merge because of a 
commit freeze, just let me know and I will remind you once the freeze is 
over.


Its really not about how obvious the bug fix is. We all know that we all 
also make obvious mistakes at time and its just really ver inconvenient 
if we have such stuff during the final build testing right before an RC.


regards,
Lukas Kahwe Smith
m...@pooteeweet.org







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

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

2009-06-10 Thread Lukas Kahwe Smith



On 10.06.2009, at 14:25, Jani Taskinen wrote:

If you're so anal about this, you better keep very good track on  
what does NOT get merged to what branch because of this freeze of  
yours.



Yes I will.

Also it doesnt have anything to do with anal .. it simply doesnt work  
to get reliable build testing and fixing done if we constantly have  
commits for bug fixes going on.


regards,
Lukas Kahwe Smith
m...@pooteeweet.org




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

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

2009-05-27 Thread Pierre-Alain Joye

pajoye  Wed May 27 22:35:26 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c php_curl.h 
  Log:
  - 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.27.2.50r2=1.62.2.14.2.27.2.51diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.50 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.51
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.50Tue May 26 15:49:15 2009
+++ php-src/ext/curl/interface.cWed May 27 22:35:26 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.50 2009/05/26 15:49:15 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.51 2009/05/27 22:35:26 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1675,11 +1675,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);
@@ -2283,7 +2283,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-std_err  Z_REFCOUNT_P(ch-handlers-std_err) = 0) {
curl_easy_setopt(ch-cp, CURLOPT_STDERR, stderr);
}
 
@@ -2312,8 +2312,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.2.2.5r2=1.44.2.2.2.2.2.6diff_format=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.44.2.2.2.2.2.5 
php-src/ext/curl/php_curl.h:1.44.2.2.2.2.2.6
--- php-src/ext/curl/php_curl.h:1.44.2.2.2.2.2.5Tue May 26 15:49:15 2009
+++ php-src/ext/curl/php_curl.h Wed May 27 22:35:26 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_curl.h,v 1.44.2.2.2.2.2.5 2009/05/26 15:49:15 jani Exp $ */
+/* $Id: php_curl.h,v 1.44.2.2.2.2.2.6 2009/05/27 22:35:26 pajoye Exp $ */
 
 #ifndef _PHP_CURL_H
 #define _PHP_CURL_H
@@ -107,7 +107,7 @@
php_curl_write *write_header;
php_curl_read  *read;
zval   *passwd;
-   zval   *stderr;
+   zval   *std_err;
php_curl_progress *progress;
 } php_curl_handlers;
 



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

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

2009-05-21 Thread Ilia Alshanetsky

iliaa   Thu May 21 12:52:05 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  
  Fixed bug #48207 (CURLOPT_(FILE|WRITEHEADER options do not error out when
  working with a non-writable stream)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.48r2=1.62.2.14.2.27.2.49diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.48 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.49
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.48Wed May 20 09:26:12 2009
+++ php-src/ext/curl/interface.cThu May 21 12:52:05 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.48 2009/05/20 09:26:12 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.49 2009/05/21 12:52:05 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1649,12 +1649,24 @@
error = CURLE_OK;
switch (option) {
case CURLOPT_FILE:
-   ch-handlers-write-fp = fp;
-   ch-handlers-write-method = 
PHP_CURL_FILE;
+   if (((php_stream *) what)-mode[0] != 
'r') {
+   ch-handlers-write-fp = fp;
+   ch-handlers-write-method = 
PHP_CURL_FILE;
+   } else {
+   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
+   RETVAL_FALSE;
+   return 1;
+   }
break;
case CURLOPT_WRITEHEADER:
-   ch-handlers-write_header-fp = fp;
-   ch-handlers-write_header-method = 
PHP_CURL_FILE;
+   if (((php_stream *) what)-mode[0] != 
'r') {
+   ch-handlers-write_header-fp 
= fp;
+   
ch-handlers-write_header-method = PHP_CURL_FILE;
+   } else {
+   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
+   RETVAL_FALSE;
+   return 1;
+   }
break;
case CURLOPT_INFILE:
zend_list_addref(Z_LVAL_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_3) /ext/curl interface.c

2009-05-20 Thread Antony Dovgal

tony2001Wed May 20 09:26:12 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.47r2=1.62.2.14.2.27.2.48diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.47 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.48
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.47Tue May 19 18:08:57 2009
+++ php-src/ext/curl/interface.cWed May 20 09:26:12 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.47 2009/05/19 18:08:57 kalle Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.48 2009/05/20 09:26:12 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1290,7 +1290,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_3) /ext/curl interface.c streams.c

2009-05-19 Thread Kalle Sommer Nielsen

kalle   Tue May 19 18:08:58 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c streams.c 
  Log:
  MFH: Fixed compiler warnings
  
  # (see previous commit message)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.46r2=1.62.2.14.2.27.2.47diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.46 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.47
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.46Mon May 18 12:51:05 2009
+++ php-src/ext/curl/interface.cTue May 19 18:08:57 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.46 2009/05/18 12:51:05 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.47 2009/05/19 18:08:57 kalle Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -967,10 +967,10 @@
MAKE_STD_ZVAL(zultotal);
MAKE_STD_ZVAL(zulnow);
 
-   ZVAL_LONG(zdltotal, dltotal);
-   ZVAL_LONG(zdlnow, dlnow);
-   ZVAL_LONG(zultotal, ultotal);
-   ZVAL_LONG(zulnow, ulnow);
+   ZVAL_LONG(zdltotal, (long) dltotal);
+   ZVAL_LONG(zdlnow, (long) dlnow);
+   ZVAL_LONG(zultotal, (long) ultotal);
+   ZVAL_LONG(zulnow, (long) ulnow);
 
argv[0] = zdltotal;
argv[1] = zdlnow;
@@ -1071,7 +1071,7 @@
 #endif
} else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) == IS_STRING) {
-   length = MIN(size * nmemb, 
Z_STRLEN_P(retval_ptr));
+   length = MIN((int) (size * nmemb), 
Z_STRLEN_P(retval_ptr));
memcpy(data, Z_STRVAL_P(retval_ptr), 
length);
}
zval_ptr_dtor(retval_ptr);
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.11.2.5r2=1.14.2.2.2.11.2.6diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14.2.2.2.11.2.5 
php-src/ext/curl/streams.c:1.14.2.2.2.11.2.6
--- php-src/ext/curl/streams.c:1.14.2.2.2.11.2.5Tue May  5 00:31:56 2009
+++ php-src/ext/curl/streams.c  Tue May 19 18:08:57 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.14.2.2.2.11.2.5 2009/05/05 00:31:56 jani Exp $ */
+/* $Id: streams.c,v 1.14.2.2.2.11.2.6 2009/05/19 18:08:57 kalle Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -132,7 +132,7 @@
 
/* our notification system only works in a single direction; we should 
detect which
 * direction is important and use the correct values in this call */
-   php_stream_notify_progress(stream-context, dlnow, dltotal);
+   php_stream_notify_progress(stream-context, (size_t) dlnow, (size_t) 
dltotal);
return 0;
 }
 



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

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

2009-05-18 Thread Pierre-Alain Joye

pajoye  Mon May 18 11:17:52 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.40r2=1.62.2.14.2.27.2.41diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.40 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.41
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.40Mon May 18 10:31:08 2009
+++ php-src/ext/curl/interface.cMon May 18 11:17:51 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.40 2009/05/18 10:31:08 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.41 2009/05/18 11:17:51 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -582,14 +582,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 */
@@ -2134,13 +2134,13 @@
case CURLINFO_PRIVATE:
case CURLINFO_EFFECTIVE_URL:
case CURLINFO_CONTENT_TYPE: {
-   char *s_code = NULL;
+   char *s_code = NULL;
 
-   if (curl_easy_getinfo(ch-cp, option, s_code) 
== CURLE_OK  s_code) {
-   RETURN_STRING(s_code, 1);
-   } else {
-   RETURN_FALSE;
-   }
+   if (curl_easy_getinfo(ch-cp, option, s_code) 
== CURLE_OK  s_code) {
+   RETURN_STRING(s_code, 1);
+   } else {
+   RETURN_FALSE;
+   }
break;
}
case CURLINFO_HTTP_CODE:



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

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

2009-05-18 Thread Pierre-Alain Joye

pajoye  Mon May 18 11:18:59 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: add CURLPROXY_SOCKS4
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.41r2=1.62.2.14.2.27.2.42diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.41 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.42
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.41Mon May 18 11:17:51 2009
+++ php-src/ext/curl/interface.cMon May 18 11:18:59 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.41 2009/05/18 11:17:51 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.42 2009/05/18 11:18:59 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -710,6 +710,7 @@
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);



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

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

2009-05-18 Thread Pierre-Alain Joye

pajoye  Mon May 18 11:48:31 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - more WS
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.42r2=1.62.2.14.2.27.2.43diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.42 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.43
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.42Mon May 18 11:18:59 2009
+++ php-src/ext/curl/interface.cMon May 18 11:48:31 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.42 2009/05/18 11:18:59 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.43 2009/05/18 11:48:31 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -223,7 +223,7 @@
 
 ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt_array, 0)
ZEND_ARG_INFO(0, ch)
-   ZEND_ARG_INFO(0, options)/* ARRAY_INFO(0, options, 0) */
+   ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO(arginfo_curl_exec, 0)
@@ -1264,7 +1264,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;
@@ -1750,7 +1750,7 @@
uint  string_key_len;
 
postfields = HASH_OF(*zvalue);
-   if (! postfields) {
+   if (!postfields) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Couldn't get HashTable in CURLOPT_POSTFIELDS);
RETVAL_FALSE;
return 1;
@@ -1929,8 +1929,8 @@
Set an option for a cURL transfer */
 PHP_FUNCTION(curl_setopt)
 {
-   zval*zid, **zvalue;
-   longzoption;
+   zval   *zid, **zvalue;
+   long   zoption;
php_curl*ch;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rlZ, zid, 
zoption, zvalue) == FAILURE) {



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

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

2009-05-18 Thread Pierre-Alain Joye

pajoye  Mon May 18 11:58:04 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.43r2=1.62.2.14.2.27.2.44diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.43 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.44
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.43Mon May 18 11:48:31 2009
+++ php-src/ext/curl/interface.cMon May 18 11:58:04 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.43 2009/05/18 11:48:31 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.44 2009/05/18 11:58:04 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -2044,16 +2044,15 @@
 {
zval*zid;
php_curl*ch;
-   int  argc = ZEND_NUM_ARGS();
long option = 0;
 
-   if (zend_parse_parameters(argc TSRMLS_CC, r|l, zid, option) == 
FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, zid, 
option) == FAILURE) {
return;
}
 
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
-   if (argc  2) {
+   if (ZEND_NUM_ARGS()  2) {
char   *s_code;
longl_code;
double  d_code;



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

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

2009-05-18 Thread Pierre-Alain Joye

pajoye  Mon May 18 12:01:44 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: use ZEND_ARG_ARRAY_INFO for arginfo_curl_setopt_array
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.44r2=1.62.2.14.2.27.2.45diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.44 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.45
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.44Mon May 18 11:58:04 2009
+++ php-src/ext/curl/interface.cMon May 18 12:01:44 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.44 2009/05/18 11:58:04 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.45 2009/05/18 12:01:44 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -223,7 +223,7 @@
 
 ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt_array, 0)
ZEND_ARG_INFO(0, ch)
-   ZEND_ARG_INFO(0, options)
+   ZEND_ARG_ARRAY_INFO(0, options, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO(arginfo_curl_exec, 0)



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

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

2009-05-18 Thread Jani Taskinen

janiMon May 18 12:51:05 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.45r2=1.62.2.14.2.27.2.46diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.45 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.46
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.45Mon May 18 12:01:44 2009
+++ php-src/ext/curl/interface.cMon May 18 12:51:05 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.45 2009/05/18 12:01:44 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.46 2009/05/18 12:51:05 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 */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_version, 0, 0, 0)
@@ -282,7 +284,6 @@
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)
ZEND_ARG_INFO(0, mh)
 ZEND_END_ARG_INFO()
-
 /* }}} */
 
 /* {{{ curl_functions[]
@@ -347,7 +348,7 @@
php_info_print_table_row(2, Age, str);
 
/* To update on each new cURL release using src/main.c in cURL sources 
*/
-   if(d-features) {
+   if (d-features) {
struct feat {
const char *name;
int bitmask;
@@ -457,7 +458,6 @@
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 */
@@ -938,11 +938,7 @@
 
 /* {{{ curl_progress
  */
-static size_t curl_progress(void *clientp,
-double dltotal,
-double dlnow,
-double ultotal,
-double ulnow)
+static size_t curl_progress(void *clientp, double dltotal, double dlnow, 
double ultotal, double ulnow)
 {
php_curl   *ch = (php_curl *) clientp;
php_curl_progress  *t  = ch-handlers-progress;
@@ -1001,8 +997,9 @@
if (Z_TYPE_P(retval_ptr) != IS_LONG) {
convert_to_long_ex(retval_ptr);
}
-   if(0 != Z_LVAL_P(retval_ptr))
+   if (0 != Z_LVAL_P(retval_ptr)) {
rval = 1;
+   }
zval_ptr_dtor(retval_ptr);
}
zval_ptr_dtor(argv[0]);
@@ -1016,7 +1013,6 @@
 }
 /* }}} */
 
-
 /* {{{ curl_read
  */
 static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
@@ -1329,10 +1325,10 @@
Initialize a cURL session */
 PHP_FUNCTION(curl_init)
 {
-   php_curl*ch;
-   CURL*cp;
-   char*url = NULL;
-   int  url_len = 0;
+   php_curl*ch;
+   CURL*cp;
+   char*url = NULL;
+   int url_len = 0;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, url, 
url_len) == FAILURE) {
return;
@@ -1388,14 +1384,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 (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, zid) == 
FAILURE) {
return;
}
+
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
cp = curl_easy_duphandle(ch-cp);
@@ -1930,16 +1926,16 @@
 PHP_FUNCTION(curl_setopt)
 {
zval   *zid, **zvalue;
-   long   zoption;
-   php_curl*ch;
+   longoptions;
+

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

2009-05-07 Thread Brian Shire

shire   Fri May  8 03:33:06 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  MFH: Add missing #ifdef for curl version that does not have FTP_FILEMETHOD or 
IPRESOLVE options. related to fix for bug #39637
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.38r2=1.62.2.14.2.27.2.39diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.38 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.39
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.38Mon May  4 14:11:45 2009
+++ php-src/ext/curl/interface.cFri May  8 03:33:06 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.38 2009/05/04 14:11:45 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.39 2009/05/08 03:33:06 shire Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -449,10 +449,12 @@
   of options and which version they were introduced */
 
/* Constants for curl_setopt() */
+#if LIBCURL_VERSION_NUM  0x070a07 /* CURLOPT_IPRESOLVE is available since 
curl 7.10.8 */
REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
+#endif
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
REGISTER_CURL_CONSTANT(CURLOPT_PORT);
@@ -1528,8 +1530,12 @@
case CURLOPT_REDIR_PROTOCOLS:
case CURLOPT_PROTOCOLS:
 #endif
+#if LIBCURL_VERSION_NUM  0x070a07 /* CURLOPT_IPRESOLVE is available since 
curl 7.10.8 */
case CURLOPT_IPRESOLVE:
+#endif
+#if LIBCURL_VERSION_NUM = 0x070f01
case CURLOPT_FTP_FILEMETHOD:
+#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_3) /ext/curl interface.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 12:12:57 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: [DOC] #47739. add option CURLOPT_IPRESOLVE which accepts 
CURL_IPRESOLVE_WHATEVER, CURL_IPRESOLVE_V4 or CURL_IPRESOLVE_V6
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.35r2=1.62.2.14.2.27.2.36diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.35 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.36
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.35Sun May  3 15:16:10 2009
+++ php-src/ext/curl/interface.cMon May  4 12:12:57 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.35 2009/05/03 15:16:10 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.36 2009/05/04 12:12:57 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -444,6 +444,10 @@
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_IPRESOLVE);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
+   REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
REGISTER_CURL_CONSTANT(CURLOPT_PORT);
@@ -1512,6 +1516,7 @@
case CURLOPT_REDIR_PROTOCOLS:
case CURLOPT_PROTOCOLS:
 #endif
+   case CURLOPT_IPRESOLVE:
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_3) /ext/curl interface.c

2009-05-04 Thread Pierre-Alain Joye

pajoye  Mon May  4 14:09:28 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - [DOC] MFH: #39637, add CURLOPT_FTP_FILEMETHOD which accepts 
CURLFTPMETHOD_MULTICWD, CURLFTPMETHOD_NOCWD and CURLFTPMETHOD_SINGLECWD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.36r2=1.62.2.14.2.27.2.37diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.36 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.37
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.36Mon May  4 12:12:57 2009
+++ php-src/ext/curl/interface.cMon May  4 14:09:28 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.36 2009/05/04 12:12:57 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.37 2009/05/04 14:09:28 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -757,6 +757,13 @@
REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
 #endif
 
+#if LIBCURL_VERSION_NUM = 0x070f01
+   REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
+   REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
+   REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
+   REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1517,6 +1524,7 @@
case CURLOPT_PROTOCOLS:
 #endif
case CURLOPT_IPRESOLVE:
+   case CURLOPT_FTP_FILEMETHOD:
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_3) /ext/curl interface.c php_curl.h

2009-05-03 Thread Pierre-Alain Joye

pajoye  Sun May  3 14:59:46 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c php_curl.h 
  Log:
  - [DOC] MFH: #41712, implement  progress callback
- add constants  CURLOPT_PROGRESSFUNCTION
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.32r2=1.62.2.14.2.27.2.33diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.32 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.33
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.32Mon Mar 16 15:08:56 2009
+++ php-src/ext/curl/interface.cSun May  3 14:59:46 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.32 2009/03/16 15:08:56 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.33 2009/05/03 14:59:46 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -457,6 +457,7 @@
REGISTER_CURL_CONSTANT(CURLOPT_HEADER);
REGISTER_CURL_CONSTANT(CURLOPT_HTTPHEADER);
REGISTER_CURL_CONSTANT(CURLOPT_NOPROGRESS);
+   REGISTER_CURL_CONSTANT(CURLOPT_PROGRESSFUNCTION);
REGISTER_CURL_CONSTANT(CURLOPT_NOBODY);
REGISTER_CURL_CONSTANT(CURLOPT_FAILONERROR);
REGISTER_CURL_CONSTANT(CURLOPT_UPLOAD);
@@ -902,6 +903,87 @@
 }
 /* }}} */
 
+/* {{{ curl_progress
+ */
+static size_t curl_progress(void *clientp,
+double dltotal,
+double dlnow,
+double ultotal,
+double ulnow)
+{
+   php_curl   *ch = (php_curl *) clientp;
+   php_curl_progress  *t  = ch-handlers-progress;
+   int length = -1;
+   size_t  rval = 0;
+
+#if PHP_CURL_DEBUG
+   fprintf(stderr, curl_progress() called\n);
+   fprintf(stderr, clientp = %x, dltotal = %f, dlnow = %f, ultotal = %f, 
ulnow = %f\n, clientp, dltotal, dlnow, ultotal, ulnow);
+#endif
+
+   switch (t-method) {
+   case PHP_CURL_USER: {
+   zval **argv[4];
+   zval  *zdltotal = NULL;
+   zval  *zdlnow = NULL;
+   zval  *zultotal = NULL;
+   zval  *zulnow = NULL;
+   zval  *retval_ptr;
+   int   error;
+   zend_fcall_info fci;
+   TSRMLS_FETCH_FROM_CTX(ch-thread_ctx);
+
+   MAKE_STD_ZVAL(zdltotal);
+   MAKE_STD_ZVAL(zdlnow);
+   MAKE_STD_ZVAL(zultotal);
+   MAKE_STD_ZVAL(zulnow);
+   
+   ZVAL_LONG(zdltotal, dltotal);
+   ZVAL_LONG(zdlnow, dlnow);
+   ZVAL_LONG(zultotal, ultotal);
+   ZVAL_LONG(zulnow, ulnow);
+
+   argv[0] = zdltotal;
+   argv[1] = zdlnow;
+   argv[2] = zultotal;
+   argv[3] = zulnow;
+
+   fci.size = sizeof(fci);
+   fci.function_table = EG(function_table);
+   fci.function_name = t-func_name;
+   fci.object_ptr = NULL;
+   fci.retval_ptr_ptr = retval_ptr;
+   fci.param_count = 4;
+   fci.params = argv;
+   fci.no_separation = 0;
+   fci.symbol_table = NULL;
+
+   ch-in_callback = 1;
+   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); 
+   length = -1;
+   } else if (retval_ptr) {
+   if (Z_TYPE_P(retval_ptr) != IS_LONG) {
+   convert_to_long_ex(retval_ptr);
+   }
+   if(0 != Z_LVAL_P(retval_ptr))
+   rval = 1;
+   zval_ptr_dtor(retval_ptr);
+   }
+   zval_ptr_dtor(argv[0]);
+   zval_ptr_dtor(argv[1]);
+   zval_ptr_dtor(argv[2]);
+   zval_ptr_dtor(argv[3]);
+   break;
+   }
+   }
+   return rval;
+}
+/* }}} */
+
+
 /* {{{ curl_read
  */
 static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
@@ -1195,6 +1277,7 @@
(*ch)-handlers-write= ecalloc(1, sizeof(php_curl_write));
(*ch)-handlers-write_header = ecalloc(1, sizeof(php_curl_write));
(*ch)-handlers-read = ecalloc(1, sizeof(php_curl_read));
+

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

2009-05-03 Thread Pierre-Alain Joye

pajoye  Sun May  3 15:03:35 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - c/p error
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.33r2=1.62.2.14.2.27.2.34diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.33 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.34
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.33Sun May  3 14:59:46 2009
+++ php-src/ext/curl/interface.cSun May  3 15:03:35 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.33 2009/05/03 14:59:46 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.34 2009/05/03 15:03:35 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -962,7 +962,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_PROGRESSFUNCTION); 
length = -1;
} else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) != IS_LONG) {



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

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

2009-03-16 Thread Felipe Pena

felipe  Mon Mar 16 15:08:56 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: Fixed bug #47616 (curl keeps crashing)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.31r2=1.62.2.14.2.27.2.32diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.31 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.32
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.31Fri Mar 13 19:39:49 2009
+++ php-src/ext/curl/interface.cMon Mar 16 15:08:56 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.31 2009/03/13 19:39:49 stas Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.32 2009/03/16 15:08:56 felipe Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1684,6 +1684,7 @@
 
} else {
 #if LIBCURL_VERSION_NUM = 0x071101
+   convert_to_string_ex(zvalue);
/* with curl 7.17.0 and later, we can use 
COPYPOSTFIELDS, but we have to provide size before */
error = curl_easy_setopt(ch-cp, 
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch-cp, 
CURLOPT_COPYPOSTFIELDS, Z_STRVAL_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_3) /ext/curl interface.c

2009-03-13 Thread Stanislav Malyshev

stasFri Mar 13 19:39:49 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.30r2=1.62.2.14.2.27.2.31diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.30 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.31
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.30Mon Jan 26 15:19:55 2009
+++ php-src/ext/curl/interface.cFri Mar 13 19:39:49 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.30 2009/01/26 15:19:55 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.31 2009/03/13 19:39:49 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -734,6 +734,24 @@
REGISTER_CURL_CONSTANT(CURLE_SSH);
 #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();
@@ -1407,6 +1425,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_3) /ext/curl interface.c

2009-01-26 Thread Ilia Alshanetsky

iliaa   Mon Jan 26 15:19:56 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  
  Fixed bug #47217 (content-type is not set properly for file uploads)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.29r2=1.62.2.14.2.27.2.30diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.29 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.30
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.29Sun Jan 25 22:33:10 2009
+++ php-src/ext/curl/interface.cMon Jan 26 15:19:55 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.29 2009/01/25 22:33:10 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.30 2009/01/26 15:19:55 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -379,7 +379,7 @@
 #if LIBCURL_VERSION_NUM  0x070f03 /* 7.15.4 */
{CharConv, CURL_VERSION_CONV},
 #endif
-   NULL, 0
+   {NULL, 0}
};
 
php_info_print_table_row(1, Features);
@@ -1626,14 +1626,13 @@
return 1;
}
if (type) {
-   type++;
error = 
curl_formadd(first, last, 

 CURLFORM_COPYNAME, string_key,

 CURLFORM_NAMELENGTH, (long)string_key_len - 1,

 CURLFORM_FILE, postval,
-   
 CURLFORM_CONTENTTYPE, type,
+   
 CURLFORM_CONTENTTYPE, type + sizeof(;type=) - 1,

 CURLFORM_END);
-   *(type - 1) = ';';
+   *type = ';';
} else {
error = 
curl_formadd(first, last, 

 CURLFORM_COPYNAME, string_key,



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

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

2009-01-25 Thread Pierre-Alain Joye

pajoye  Sun Jan 25 16:28:19 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH
   - [DOC] Add support for SSH via libssh2
- new constants: CURLE_SSH, CURLSSH_AUTH_NONE, CURLSSH_AUTH_PUBLICKEY, 
CURLSSH_AUTH_PASSWORD, CURLSSH_AUTH_HOST, CURLSSH_AUTH_KEYBOARD, 
CURLSSH_AUTH_DEFAULT, CURLOPT_SSH_AUTH_TYPES, CURLOPT_KEYPASSWD, 
CURLOPT_SSH_PUBLIC_KEYFILE, CURLOPT_SSH_PRIVATE_KEYFILE, 
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
 See http://curl.haxx.se/libcurl/c/curl_easy_setopt.html fortheir roles or 
usages
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.26r2=1.62.2.14.2.27.2.27diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.26 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.27
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.26Wed Dec 31 11:15:35 2008
+++ php-src/ext/curl/interface.cSun Jan 25 16:28:18 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.26 2008/12/31 11:15:35 sebastian Exp $ 
*/
+/* $Id: interface.c,v 1.62.2.14.2.27.2.27 2009/01/25 16:28:18 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -433,7 +433,7 @@
}
 #endif
 
-#if defined(CURLVERSION_FOURTH)   CURLVERSION_NOW = CURLVERSION_FOURTH
+#if LIBCURL_VERSION_NUM = 0x071300
 
if (d-iconv_ver_num) {
php_info_print_table_row(2, IconV Version, d-iconv_ver_num);
@@ -696,7 +696,9 @@
 #if LIBCURL_VERSION_NUM = 0x070b00
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
 #endif
-
+#if LIBCURL_VERSION_NUM = 0x071300
+   REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
 
@@ -732,6 +734,22 @@
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 #endif
 
+/* SSH support works in 7.19.0+ using libssh2 */
+#if LIBCURL_VERSION_NUM = 0x071300
+   REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE);
+   REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PUBLICKEY);
+   REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PASSWORD);
+   REGISTER_CURL_CONSTANT(CURLSSH_AUTH_HOST);
+   REGISTER_CURL_CONSTANT(CURLSSH_AUTH_KEYBOARD);
+   REGISTER_CURL_CONSTANT(CURLSSH_AUTH_DEFAULT);
+   REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
+   REGISTER_CURL_CONSTANT(CURLOPT_KEYPASSWD);
+   REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
+   REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
+   REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
+   REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1442,14 +1460,23 @@
case CURLOPT_SSLENGINE: 
case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE:
-   case CURLOPT_ENCODING: {
+   case CURLOPT_ENCODING:
+#if LIBCURL_VERSION_NUM = 0x071300
+   case CURLOPT_SSH_PUBLIC_KEYFILE:
+   case CURLOPT_SSH_PRIVATE_KEYFILE: 
+#endif
+   {
 #if LIBCURL_VERSION_NUM  0x071100
char *copystr = NULL;
 #endif

convert_to_string_ex(zvalue);
 
-   if (option == CURLOPT_URL) {
+   if (option == CURLOPT_URL
+#if LIBCURL_VERSION_NUM = 0x071300
+   || option == CURLOPT_SSH_PUBLIC_KEYFILE || 
option == CURLOPT_SSH_PRIVATE_KEYFILE
+#endif
+   ) {

PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
}
 
@@ -1471,7 +1498,7 @@
FILE *fp = NULL;
int type;
void * what;
-   
+
what = zend_fetch_resource(zvalue TSRMLS_CC, -1, 
File-Handle, type, 1, php_file_le_stream());
if (!what) {
RETVAL_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_3) /ext/curl interface.c

2009-01-25 Thread Pierre-Alain Joye

pajoye  Sun Jan 25 17:12:37 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - nicer features list
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.27r2=1.62.2.14.2.27.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.2.27 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.28
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.27Sun Jan 25 16:28:18 2009
+++ php-src/ext/curl/interface.cSun Jan 25 17:12:36 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.27 2009/01/25 16:28:18 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.28 2009/01/25 17:12:36 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -332,77 +332,64 @@
sprintf(str, %d, d-age);
php_info_print_table_row(2, Age, str);
 
-#ifdef CURL_VERSION_IPV6
-   if (d-features  CURL_VERSION_IPV6) {
-   n = sprintf(str, %s, IPv6-enabled, );
-   }
-#endif
+   /* To update on each new cURL release using src/main.c in cURL sources 
*/
+   if(d-features) {
+   struct feat {
+   const char *name;
+   int bitmask;
+   };
 
-#ifdef CURL_VERSION_KERBEROS4
-   if (d-features  CURL_VERSION_KERBEROS4) {
-   n += sprintf(str + n, %s, kerberos auth is 
supported, );
-   }
-#endif
+   unsigned int i;
 
-#ifdef CURL_VERSION_SSL
-   if (d-features  CURL_VERSION_SSL) {
-   n += sprintf(str + n, %s, SSL options are present, 
);
-   }
-#endif
-
-#ifdef CURL_VERSION_LIBZ
-   if (d-features  CURL_VERSION_LIBZ) {
-   n += sprintf(str + n, %s, libz features are present, 
);
-   }
+   static const struct feat feats[] = {
+#if LIBCURL_VERSION_NUM  0x070a06 /* 7.10.7 */
+   {AsynchDNS, CURL_VERSION_ASYNCHDNS},
 #endif
-
 #if LIBCURL_VERSION_NUM  0x070a05 /* 7.10.6 */
-   if (d-features  CURL_VERSION_NTLM) {
-   n += sprintf(str + n, %s, NTLM auth is supported, );
-   }
-   if (d-features  CURL_VERSION_GSSNEGOTIATE) {
-   n += sprintf(str + n, %s, Negotiate auth support, );
-   }
-   if (d-features  CURL_VERSION_DEBUG) {
-   n += sprintf(str + n, %s, built with debug 
capabilities, );
-   }
+   {Debug, CURL_VERSION_DEBUG},
+   {GSS-Negotiate, CURL_VERSION_GSSNEGOTIATE},
 #endif
-
-#if LIBCURL_VERSION_NUM  0x070a06 /* 7.10.7 */
-   if (d-features  CURL_VERSION_ASYNCHDNS) {
-   n += sprintf(str + n, %s, asynchronous dns resolves, 
);
-   }
+#if LIBCURL_VERSION_NUM  0x070b02 /* 7.12.0 */
+   {IDN, CURL_VERSION_IDN},
 #endif
-#if LIBCURL_VERSION_NUM  0x070a07 /* 7.10.8 */
-   if (d-features  CURL_VERSION_SPNEGO) {
-   n += sprintf(str + n, %s, SPNEGO auth, );
-   }
+#ifdef CURL_VERSION_IPV6
+   {IPv6, CURL_VERSION_IPV6},
 #endif
 #if LIBCURL_VERSION_NUM  0x070a09 /* 7.10.1 */
-   if (d-features  CURL_VERSION_LARGEFILE) {
-   n += sprintf(str + n, %s, supports files bigger than 
2GB, );
-   }
+   {Largefile, CURL_VERSION_LARGEFILE},
 #endif
-#if LIBCURL_VERSION_NUM  0x070b02 /* 7.12.0 */
-   if (d-features  CURL_VERSION_IDN) {
-   n += sprintf(str + n, %s, International Domain Names 
support, );
-   }
+#if LIBCURL_VERSION_NUM  0x070a05 /* 7.10.6 */
+   {NTLM, CURL_VERSION_NTLM},
+#endif
+#if LIBCURL_VERSION_NUM  0x070a07 /* 7.10.8 */
+   {SPNEGO, CURL_VERSION_SPNEGO},
+#endif
+#ifdef CURL_VERSION_SSL
+   {SSL,  CURL_VERSION_SSL},
 #endif
 #if LIBCURL_VERSION_NUM  0x070d01 /* 7.13.2 */
-   if (d-features  CURL_VERSION_SSPI) {
-   n += sprintf(str + n, %s, SSPI is supported, );
-   }
+   {SSPI,  CURL_VERSION_SSPI},
+#endif
+#ifdef CURL_VERSION_KERBEROS4
+   {krb4, CURL_VERSION_KERBEROS4},
+#endif
+#ifdef CURL_VERSION_LIBZ
+   {libz, CURL_VERSION_LIBZ},
 #endif
 #if LIBCURL_VERSION_NUM  0x070f03 /* 7.15.4 */
-   if (d-features  CURL_VERSION_CONV) {   
-   n += sprintf(str + n, %s, character conversions are 
supported, );
-   }
+   {CharConv, CURL_VERSION_CONV},
 #endif
+   NULL, 0
+   };
 
-   if (n  3) {
-   str[n - 2] = '\0';
+   php_info_print_table_row(1, Features);
+   for(i=0; isizeof(feats)/sizeof(feats[0]); i++) {
+   if (feats[i].name) {
+

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

2009-01-25 Thread Antony Dovgal

tony2001Sun Jan 25 22:33:10 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  do not define CURLE_SSH twice
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.28r2=1.62.2.14.2.27.2.29diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.28 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.29
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.28Sun Jan 25 17:12:36 2009
+++ php-src/ext/curl/interface.cSun Jan 25 22:33:10 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.28 2009/01/25 17:12:36 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.29 2009/01/25 22:33:10 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -683,9 +683,6 @@
 #if LIBCURL_VERSION_NUM = 0x070b00
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
 #endif
-#if LIBCURL_VERSION_NUM = 0x071300
-   REGISTER_CURL_CONSTANT(CURLE_SSH);
-#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_3) /ext/curl interface.c php_curl.h

2008-12-17 Thread Jani Taskinen

janiWed Dec 17 14:13:41 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c php_curl.h 
  Log:
  MFH:- Fixed bug #45161 (Reusing a curl handle leaks memory)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.24r2=1.62.2.14.2.27.2.25diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.24 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.25
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.24Tue Dec  9 17:17:27 2008
+++ php-src/ext/curl/interface.cWed Dec 17 14:13:40 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.24 2008/12/09 17:17:27 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.25 2008/12/17 14:13:40 jani Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1098,6 +1098,7 @@
 /* }}} */
 #endif
 
+#if LIBCURL_VERSION_NUM  0x071101
 /* {{{ curl_free_string
  */
 static void curl_free_string(void **string)
@@ -1105,6 +1106,7 @@
efree(*string);
 }  
 /* }}} */
+#endif
 
 /* {{{ curl_free_post
  */
@@ -1179,7 +1181,9 @@

memset((*ch)-err, 0, sizeof((*ch)-err));

+#if LIBCURL_VERSION_NUM  0x071101
zend_llist_init((*ch)-to_free.str,   sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
+#endif
zend_llist_init((*ch)-to_free.slist, sizeof(struct curl_slist), 
(llist_dtor_func_t) curl_free_slist,  0);
zend_llist_init((*ch)-to_free.post,  sizeof(struct HttpPost),   
(llist_dtor_func_t) curl_free_post,   0);
 }
@@ -1237,11 +1241,15 @@
 #endif
 
if (url) {
+#if LIBCURL_VERSION_NUM = 0x071100
+   curl_easy_setopt(ch-cp, CURLOPT_URL, url);
+#else
char *urlcopy;
 
urlcopy = estrndup(url, url_len);
curl_easy_setopt(ch-cp, CURLOPT_URL, urlcopy);
zend_llist_add_element(ch-to_free.str, urlcopy);
+#endif
}
 
ZEND_REGISTER_RESOURCE(return_value, ch, le_curl);
@@ -1308,9 +1316,11 @@
curl_easy_setopt(dupch-cp, CURLOPT_INFILE,(void *) dupch);
curl_easy_setopt(dupch-cp, CURLOPT_WRITEHEADER,   (void *) dupch);
 
+#if LIBCURL_VERSION_NUM  0x071101
zend_llist_copy(dupch-to_free.str, ch-to_free.str);
/* Don't try to free copied strings, they're free'd when the original 
handle is destroyed */
dupch-to_free.str.dtor = NULL;
+#endif
zend_llist_copy(dupch-to_free.slist, ch-to_free.slist);
zend_llist_copy(dupch-to_free.post, ch-to_free.post);
 
@@ -1433,7 +1443,9 @@
case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE:
case CURLOPT_ENCODING: {
+#if LIBCURL_VERSION_NUM  0x071100
char *copystr = NULL;
+#endif

convert_to_string_ex(zvalue);
 
@@ -1441,9 +1453,14 @@

PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
}
 
+#if LIBCURL_VERSION_NUM = 0x071100
+   /* Strings passed to libcurl as âchar *â arguments, 
are copied by the library... NOTE: before 7.17.0 strings were not copied. */
+   error = curl_easy_setopt(ch-cp, option, 
Z_STRVAL_PP(zvalue));
+#else
copystr = estrndup(Z_STRVAL_PP(zvalue), 
Z_STRLEN_PP(zvalue));
error = curl_easy_setopt(ch-cp, option, copystr);
zend_llist_add_element(ch-to_free.str, copystr);
+#endif
 
break;
}
@@ -1634,6 +1651,11 @@
error = curl_easy_setopt(ch-cp, 
CURLOPT_HTTPPOST, first);
 
} else {
+#if LIBCURL_VERSION_NUM = 0x071101
+   /* with curl 7.17.0 and later, we can use 
COPYPOSTFIELDS, but we have to provide size before */
+   error = curl_easy_setopt(ch-cp, 
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
+   error = curl_easy_setopt(ch-cp, 
CURLOPT_COPYPOSTFIELDS, Z_STRVAL_PP(zvalue));
+#else
char *post = NULL;
 
convert_to_string_ex(zvalue);
@@ -1642,6 +1664,7 @@
 
error = curl_easy_setopt(ch-cp, 
CURLOPT_POSTFIELDS, post);
error = curl_easy_setopt(ch-cp, 
CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
+#endif
}
break;
case CURLOPT_HTTPHEADER: 
@@ -1663,20 +1686,15 @@
 zend_hash_get_current_data(ph, (void **) 
current) == SUCCESS;
 zend_hash_move_forward(ph)
) {
-   char *indiv = NULL;
-

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

2008-12-09 Thread Ilia Alshanetsky

iliaa   Tue Dec  9 17:17:28 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  Fixed missing initialization of uses when copying a curl handle
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.23r2=1.62.2.14.2.27.2.24diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.23 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.24
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.23Thu Dec  4 13:13:22 2008
+++ php-src/ext/curl/interface.cTue Dec  9 17:17:27 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.23 2008/12/04 13:13:22 mkoppanen Exp $ 
*/
+/* $Id: interface.c,v 1.62.2.14.2.27.2.24 2008/12/09 17:17:27 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1273,6 +1273,7 @@
TSRMLS_SET_CTX(dupch-thread_ctx);
 
dupch-cp = cp;
+   dupch-uses = 0;
dupch-handlers-write-method = ch-handlers-write-method;
dupch-handlers-write-type   = ch-handlers-write-type;
dupch-handlers-read-method  = ch-handlers-read-method;



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

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

2008-12-04 Thread Mikko Koppanen

mkoppanen   Thu Dec  4 13:13:22 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.22r2=1.62.2.14.2.27.2.23diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.23
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22Sun Nov 30 17:30:50 2008
+++ php-src/ext/curl/interface.cThu Dec  4 13:13:22 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.22 2008/11/30 17:30:50 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.23 2008/12/04 13:13:22 mkoppanen Exp $ 
*/
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1870,6 +1870,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_3) /ext/curl interface.c /ext/curl/tests bug46711.phpt

2008-11-30 Thread Ilia Alshanetsky

iliaa   Sun Nov 30 17:30:50 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/curl/tests bug46711.phpt 

  Modified files:  
/php-src/ext/curl   interface.c 
  Log:
  Fixed bug #46711 (cURL curl_setopt leaks memory in foreach loops).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.21r2=1.62.2.14.2.27.2.22diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.21 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.21Thu Nov 27 19:01:22 2008
+++ php-src/ext/curl/interface.cSun Nov 30 17:30:50 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.21 2008/11/27 19:01:22 dmitry Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.22 2008/11/30 17:30:50 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1733,17 +1733,17 @@
Set an option for a cURL transfer */
 PHP_FUNCTION(curl_setopt)
 {
-   zval*zid, *zvalue;
+   zval*zid, **zvalue;
longzoption;
php_curl*ch;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rlz, zid, 
zoption, zvalue) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rlZ, zid, 
zoption, zvalue) == FAILURE) {
return;
}
 
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
-   if (!_php_curl_setopt(ch, zoption, zvalue, return_value TSRMLS_CC)) {
+   if (!_php_curl_setopt(ch, zoption, zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {
RETURN_FALSE;

http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46711.phpt?view=markuprev=1.1
Index: php-src/ext/curl/tests/bug46711.phpt
+++ php-src/ext/curl/tests/bug46711.phpt



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

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

2008-11-27 Thread Ilia Alshanetsky

iliaa   Thu Nov 27 17:00:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  Fixed bug #46696 (cURL fails in upload files with specified content-type)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.19r2=1.62.2.14.2.27.2.20diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.19 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.20
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.19Mon Nov 17 11:27:53 2008
+++ php-src/ext/curl/interface.cThu Nov 27 17:00:04 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.19 2008/11/17 11:27:53 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.20 2008/11/27 17:00:04 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1582,17 +1582,37 @@
 * must be explicitly cast to long in 
curl_formadd
 * use since curl needs a long not an 
int. */
if (*postval == '@') {
+   char *type;
++postval;
+
+   if ((type = 
php_memnstr(postval, ;type=, sizeof(;type=) - 1, postval + 
strlen(postval {
+   *type = '\0';
+   }
/* safe_mode / open_basedir 
check */
if 
(php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode)  
!php_checkuid(postval, rb+, CHECKUID_CHECK_MODE_PARAM))) {
+   if (type) {
+   *type = ';';
+   }
RETVAL_FALSE;
return 1;
}
-   error = curl_formadd(first, 
last, 
+   if (type) {
+   type++;
+   error = 
curl_formadd(first, last, 
+   
 CURLFORM_COPYNAME, string_key,
+   
 CURLFORM_NAMELENGTH, (long)string_key_len - 1,
+   
 CURLFORM_FILE, postval,
+   
 CURLFORM_CONTENTTYPE, type,
+   
 CURLFORM_END);
+   *(type - 1) = ';';
+   } else {
+   error = 
curl_formadd(first, last, 

 CURLFORM_COPYNAME, string_key,

 CURLFORM_NAMELENGTH, (long)string_key_len - 1,
-   
 CURLFORM_FILE, postval, 
+   
 CURLFORM_FILE, postval,

 CURLFORM_END);
+
+   }
} else {
error = curl_formadd(first, 
last, 

 CURLFORM_COPYNAME, string_key,



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

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

2008-11-12 Thread Jani Taskinen


Pierre Joye wrote:

On Tue, Nov 11, 2008 at 7:34 PM, Jani Taskinen [EMAIL PROTECTED] wrote:

Pierre Joye kirjoitti:

hi Jani,

On Tue, Nov 11, 2008 at 12:56 PM, Jani Taskinen [EMAIL PROTECTED] wrote:

janiTue Nov 11 11:56:01 2008 UTC

 Modified files:  (Branch: PHP_5_3)
  /php-src/ext/curl   interface.c
 Log:
 fix build

You aer likely to get more troubles than expected if you can't
actually work nicely and in a respectful manner with the other
developers. Please reconsider your attitude.

You will get in more trouble as long as you don't deliver what you promise.
Besides, this code sucks ass.


What sucks ass as you say is your miserable attitude. Nothing can or
will be solved as long as you act like that, got it or move on.


Miserable attitude? ROFLMAO..

Maybe if YOU stopped and thought for a moment WHY I have this attitude 
towards YOU? (note: it's just you..nobody else)
For example, why is this discussion only happening when mails go to a 
public mailinglist. (answer: you don't bother replying to anything else)


Pay me what you owe me. That's the way to get my miserable attitude 
changed.


--Jani

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

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

2008-11-12 Thread Pierre Joye

On Wed, Nov 12, 2008 at 9:15 AM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Pierre Joye wrote:

 On Tue, Nov 11, 2008 at 7:34 PM, Jani Taskinen [EMAIL PROTECTED]
 wrote:

 Pierre Joye kirjoitti:

 hi Jani,

 On Tue, Nov 11, 2008 at 12:56 PM, Jani Taskinen [EMAIL PROTECTED] wrote:

 janiTue Nov 11 11:56:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
  /php-src/ext/curl   interface.c
  Log:
  fix build

 You aer likely to get more troubles than expected if you can't
 actually work nicely and in a respectful manner with the other
 developers. Please reconsider your attitude.

 You will get in more trouble as long as you don't deliver what you
 promise.
 Besides, this code sucks ass.

 What sucks ass as you say is your miserable attitude. Nothing can or
 will be solved as long as you act like that, got it or move on.

 Miserable attitude? ROFLMAO..

 Maybe if YOU stopped and thought for a moment WHY I have this attitude
 towards YOU? (note: it's just you..nobody else)
 For example, why is this discussion only happening when mails go to a public
 mailinglist. (answer: you don't bother replying to anything else)

Read again your mail, if you see nothing wrong in them then please
pardon me because I fail to find what else I could say. And again, it
is not only with me. And everything else not related to the list does
not belong to the list anyway (and read your mails as
well...pathetic).


Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

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

2008-11-12 Thread Jani Taskinen


So in your opinion it's pathetic to ask for you to pay me what you owe me?

--Jani

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

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

2008-11-12 Thread Kalle Sommer Nielsen

2008/11/12 Jani Taskinen [EMAIL PROTECTED]:
 So in your opinion it's pathetic to ask for you to pay me what you owe me?

Can't you just keep this private instead of filling up mine and others
inboxes up with this?

 --Jani

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





-- 
Kalle Sommer Nielsen

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

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

2008-11-12 Thread Pierre Joye

On Wed, Nov 12, 2008 at 2:46 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 So in your opinion it's pathetic to ask for you to pay me what you owe me?

.

-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

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

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

2008-11-11 Thread Antony Dovgal

On 11.11.2008 01:59, Pierre-Alain Joye wrote:
 pajoyeMon Nov 10 22:59:28 2008 UTC
 
   Modified files:  (Branch: PHP_5_3)
 /php-src/ext/curl interface.c 
   Log:
   - MFH: make the curl phpinfo more verbose

 + if (d-libssh_version) {
 + php_info_print_table_row(2, libSSH Version, 
 d-libssh_version);
 + }
 +

Pierre, this doesn't work here.

/local/qa/5_3.gcov/ext/curl/interface.c: In function 'zm_info_curl':
/local/qa/5_3.gcov/ext/curl/interface.c:427: error: 'curl_version_info_data' 
has no member named 'libssh_version'
/local/qa/5_3.gcov/ext/curl/interface.c:428: error: 'curl_version_info_data' 
has no member named 'libssh_version'

-- 
Wbr, 
Antony Dovgal

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

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

2008-11-11 Thread Jani Taskinen


Pierre Joye kirjoitti:

hi Jani,

On Tue, Nov 11, 2008 at 12:56 PM, Jani Taskinen [EMAIL PROTECTED] wrote:

janiTue Nov 11 11:56:01 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/curl   interface.c
 Log:
 fix build


You aer likely to get more troubles than expected if you can't
actually work nicely and in a respectful manner with the other
developers. Please reconsider your attitude.


You will get in more trouble as long as you don't deliver what you promise.
Besides, this code sucks ass.

--Jani


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

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

2008-11-11 Thread Pierre Joye

On Tue, Nov 11, 2008 at 7:34 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 Pierre Joye kirjoitti:

 hi Jani,

 On Tue, Nov 11, 2008 at 12:56 PM, Jani Taskinen [EMAIL PROTECTED] wrote:

 janiTue Nov 11 11:56:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
   /php-src/ext/curl   interface.c
  Log:
  fix build

 You aer likely to get more troubles than expected if you can't
 actually work nicely and in a respectful manner with the other
 developers. Please reconsider your attitude.

 You will get in more trouble as long as you don't deliver what you promise.
 Besides, this code sucks ass.

What sucks ass as you say is your miserable attitude. Nothing can or
will be solved as long as you act like that, got it or move on.

Cheers,
-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

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

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

2008-11-11 Thread Jani Taskinen

janiTue Nov 11 11:56:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.16r2=1.62.2.14.2.27.2.17diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.16 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.17
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.16Mon Nov 10 22:59:28 2008
+++ php-src/ext/curl/interface.cTue Nov 11 11:56:01 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.16 2008/11/10 22:59:28 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.17 2008/11/11 11:56:01 jani Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -338,96 +338,9 @@
  */
 PHP_MINFO_FUNCTION(curl)
 {
-
-
-   curl_version_info_data *d;
-   char **p;
-   char str[1024];
-   size_t n = 0;
-
-
-   d = curl_version_info(CURLVERSION_NOW);
php_info_print_table_start();
php_info_print_table_row(2, cURL support,enabled);
-   php_info_print_table_row(2, cURL Information, d-version);
-   sprintf(str, %d, d-age);
-   php_info_print_table_row(2, Age, str);
-
-
-   if (d-features  CURL_VERSION_IPV6) {
-   n = sprintf(str, %s, IPv6-enabled, );
-   }
-   if (d-features  CURL_VERSION_KERBEROS4) {
-   n += sprintf(str + n, %s, kerberos auth is 
supported, );
-   }
-   if (d-features  CURL_VERSION_SSL) {
-   n += sprintf(str + n, %s, SSL options are present, 
);
-   }
-   if (d-features  CURL_VERSION_LIBZ) {
-   n += sprintf(str + n, %s, libz features are present, 
);
-   }
-   if (d-features  CURL_VERSION_NTLM) {
-   n += sprintf(str + n, %s, NTLM auth is supported, );
-   }
-   if (d-features  CURL_VERSION_GSSNEGOTIATE) {
-   n += sprintf(str + n, %s, Negotiate auth support, );
-   }
-   if (d-features  CURL_VERSION_DEBUG) {
-   n += sprintf(str + n, %s, built with debug 
capabilities, );
-   }
-   if (d-features  CURL_VERSION_ASYNCHDNS) {
-   n += sprintf(str + n, %s, asynchronous dns resolves, 
);
-   }
-   if (d-features  CURL_VERSION_SPNEGO) {
-   n += sprintf(str + n, %s, SPNEGO auth, );
-   }
-   if (d-features  CURL_VERSION_LARGEFILE) {
-   n += sprintf(str + n, %s, supports files bigger than 
2GB, );
-   }
-   if (d-features  CURL_VERSION_IDN) {
-   n += sprintf(str + n, %s, International Domain Names 
support, );
-   }
-   if (d-features  CURL_VERSION_SSPI) {
-   n += sprintf(str + n, %s, SSPI is supported, );
-   }
-   if (d-features  CURL_VERSION_CONV) {   
-   n += sprintf(str + n, %s, character conversions are 
supported, );
-   }
-
-   if (n  3) {
-   str[n - 2] = '\0';
-   }
-   php_info_print_table_row(2, Features, str);
-   n = 0;
-   p = (char **) d-protocols;
-   while (*p != NULL) {
-   n += sprintf(str + n, %s%s, *p, *(p + 1) != NULL ? , 
 : );
-   p++;
-   }
-   php_info_print_table_row(2, Protocols, str);
-
-   php_info_print_table_row(2, Host, d-host);
-
-   if (d-ssl_version) {
-   php_info_print_table_row(2, SSL Version, d-ssl_version);
-   }
-
-   if (d-libz_version) {
-   php_info_print_table_row(2, ZLib Version, d-libz_version);
-   }
-
-   if (d-libz_version) {
-   php_info_print_table_row(2, libIDN Version, d-libidn);
-   }
-   
-   if (d-iconv_ver_num) {
-   php_info_print_table_row(2, IconV Version, d-iconv_ver_num);
-   }
-
-   if (d-libssh_version) {
-   php_info_print_table_row(2, libSSH Version, 
d-libssh_version);
-   }
-
+   php_info_print_table_row(2, cURL Information, curl_version());
php_info_print_table_end();
 }
 /* }}} */



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

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

2008-11-11 Thread Pierre Joye

hi Jani,

On Tue, Nov 11, 2008 at 12:56 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
 janiTue Nov 11 11:56:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c
  Log:
  fix build

You aer likely to get more troubles than expected if you can't
actually work nicely and in a respectful manner with the other
developers. Please reconsider your attitude.

Cheers,
-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

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

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

2008-11-11 Thread Pierre-Alain Joye

pajoye  Tue Nov 11 12:26:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: fix build with all curl versions, even very old (thx Felipe for having 
found all versions info)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.17r2=1.62.2.14.2.27.2.18diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.17 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.18
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.17Tue Nov 11 11:56:01 2008
+++ php-src/ext/curl/interface.cTue Nov 11 12:26:04 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.17 2008/11/11 11:56:01 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.18 2008/11/11 12:26:04 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -338,9 +338,129 @@
  */
 PHP_MINFO_FUNCTION(curl)
 {
+   curl_version_info_data *d;
+   char **p;
+   char str[1024];
+   size_t n = 0;
+
+   d = curl_version_info(CURLVERSION_NOW);
php_info_print_table_start();
php_info_print_table_row(2, cURL support,enabled);
-   php_info_print_table_row(2, cURL Information, curl_version());
+   php_info_print_table_row(2, cURL Information, d-version);
+   sprintf(str, %d, d-age);
+   php_info_print_table_row(2, Age, str);
+
+#ifdef CURL_VERSION_IPV6
+   if (d-features  CURL_VERSION_IPV6) {
+   n = sprintf(str, %s, IPv6-enabled, );
+   }
+#endif
+
+#ifdef CURL_VERSION_KERBEROS4
+   if (d-features  CURL_VERSION_KERBEROS4) {
+   n += sprintf(str + n, %s, kerberos auth is 
supported, );
+   }
+#endif
+
+#ifdef CURL_VERSION_SSL
+   if (d-features  CURL_VERSION_SSL) {
+   n += sprintf(str + n, %s, SSL options are present, 
);
+   }
+#endif
+
+#ifdef CURL_VERSION_LIBZ
+   if (d-features  CURL_VERSION_LIBZ) {
+   n += sprintf(str + n, %s, libz features are present, 
);
+   }
+#endif
+
+#if LIBCURL_VERSION_NUM  0x070a05 /* 7.10.6 */
+   if (d-features  CURL_VERSION_NTLM) {
+   n += sprintf(str + n, %s, NTLM auth is supported, );
+   }
+   if (d-features  CURL_VERSION_GSSNEGOTIATE) {
+   n += sprintf(str + n, %s, Negotiate auth support, );
+   }
+   if (d-features  CURL_VERSION_DEBUG) {
+   n += sprintf(str + n, %s, built with debug 
capabilities, );
+   }
+#endif
+
+#if LIBCURL_VERSION_NUM  0x070a06 /* 7.10.7 */
+   if (d-features  CURL_VERSION_ASYNCHDNS) {
+   n += sprintf(str + n, %s, asynchronous dns resolves, 
);
+   }
+#endif
+#if LIBCURL_VERSION_NUM  0x070a07 /* 7.10.8 */
+   if (d-features  CURL_VERSION_SPNEGO) {
+   n += sprintf(str + n, %s, SPNEGO auth, );
+   }
+#endif
+#if LIBCURL_VERSION_NUM  0x070a09 /* 7.10.1 */
+   if (d-features  CURL_VERSION_LARGEFILE) {
+   n += sprintf(str + n, %s, supports files bigger than 
2GB, );
+   }
+#endif
+#if LIBCURL_VERSION_NUM  0x070b02 /* 7.12.0 */
+   if (d-features  CURL_VERSION_IDN) {
+   n += sprintf(str + n, %s, International Domain Names 
support, );
+   }
+#endif
+#if LIBCURL_VERSION_NUM  0x070d01 /* 7.13.2 */
+   if (d-features  CURL_VERSION_SSPI) {
+   n += sprintf(str + n, %s, SSPI is supported, );
+   }
+#endif
+#if LIBCURL_VERSION_NUM  0x070f03 /* 7.15.4 */
+   if (d-features  CURL_VERSION_CONV) {   
+   n += sprintf(str + n, %s, character conversions are 
supported, );
+   }
+#endif
+
+   if (n  3) {
+   str[n - 2] = '\0';
+   }
+   php_info_print_table_row(2, Features, str);
+   n = 0;
+   p = (char **) d-protocols;
+   while (*p != NULL) {
+   n += sprintf(str + n, %s%s, *p, *(p + 1) != NULL ? , 
 : );
+   p++;
+   }
+   php_info_print_table_row(2, Protocols, str);
+
+   php_info_print_table_row(2, Host, d-host);
+
+   if (d-ssl_version) {
+   php_info_print_table_row(2, SSL Version, d-ssl_version);
+   }
+
+   if (d-libz_version) {
+   php_info_print_table_row(2, ZLib Version, d-libz_version);
+   }
+
+#if defined(CURLVERSION_SECOND)  CURLVERSION_NOW = CURLVERSION_SECOND
+   if (d-ares) {
+   php_info_print_table_row(2, ZLib Version, d-ares);
+   }
+#endif
+
+#if defined(CURLVERSION_THIRD)  CURLVERSION_NOW = CURLVERSION_THIRD
+   if (d-libidn) {
+   php_info_print_table_row(2, libIDN Version, d-libidn);
+   }
+#endif
+
+#if defined(CURLVERSION_FOURTH)   CURLVERSION_NOW = CURLVERSION_FOURTH
+
+   if (d-iconv_ver_num) {
+   php_info_print_table_row(2, IconV Version,

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

2008-11-10 Thread Pierre-Alain Joye

pajoye  Mon Nov 10 22:59:28 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFH: make the curl phpinfo more verbose
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.15r2=1.62.2.14.2.27.2.16diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.15 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.16
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.15Sun Nov  2 21:19:30 2008
+++ php-src/ext/curl/interface.cMon Nov 10 22:59:28 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.15 2008/11/02 21:19:30 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.16 2008/11/10 22:59:28 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -338,9 +338,96 @@
  */
 PHP_MINFO_FUNCTION(curl)
 {
+
+
+   curl_version_info_data *d;
+   char **p;
+   char str[1024];
+   size_t n = 0;
+
+
+   d = curl_version_info(CURLVERSION_NOW);
php_info_print_table_start();
php_info_print_table_row(2, cURL support,enabled);
-   php_info_print_table_row(2, cURL Information, curl_version());
+   php_info_print_table_row(2, cURL Information, d-version);
+   sprintf(str, %d, d-age);
+   php_info_print_table_row(2, Age, str);
+
+
+   if (d-features  CURL_VERSION_IPV6) {
+   n = sprintf(str, %s, IPv6-enabled, );
+   }
+   if (d-features  CURL_VERSION_KERBEROS4) {
+   n += sprintf(str + n, %s, kerberos auth is 
supported, );
+   }
+   if (d-features  CURL_VERSION_SSL) {
+   n += sprintf(str + n, %s, SSL options are present, 
);
+   }
+   if (d-features  CURL_VERSION_LIBZ) {
+   n += sprintf(str + n, %s, libz features are present, 
);
+   }
+   if (d-features  CURL_VERSION_NTLM) {
+   n += sprintf(str + n, %s, NTLM auth is supported, );
+   }
+   if (d-features  CURL_VERSION_GSSNEGOTIATE) {
+   n += sprintf(str + n, %s, Negotiate auth support, );
+   }
+   if (d-features  CURL_VERSION_DEBUG) {
+   n += sprintf(str + n, %s, built with debug 
capabilities, );
+   }
+   if (d-features  CURL_VERSION_ASYNCHDNS) {
+   n += sprintf(str + n, %s, asynchronous dns resolves, 
);
+   }
+   if (d-features  CURL_VERSION_SPNEGO) {
+   n += sprintf(str + n, %s, SPNEGO auth, );
+   }
+   if (d-features  CURL_VERSION_LARGEFILE) {
+   n += sprintf(str + n, %s, supports files bigger than 
2GB, );
+   }
+   if (d-features  CURL_VERSION_IDN) {
+   n += sprintf(str + n, %s, International Domain Names 
support, );
+   }
+   if (d-features  CURL_VERSION_SSPI) {
+   n += sprintf(str + n, %s, SSPI is supported, );
+   }
+   if (d-features  CURL_VERSION_CONV) {   
+   n += sprintf(str + n, %s, character conversions are 
supported, );
+   }
+
+   if (n  3) {
+   str[n - 2] = '\0';
+   }
+   php_info_print_table_row(2, Features, str);
+   n = 0;
+   p = (char **) d-protocols;
+   while (*p != NULL) {
+   n += sprintf(str + n, %s%s, *p, *(p + 1) != NULL ? , 
 : );
+   p++;
+   }
+   php_info_print_table_row(2, Protocols, str);
+
+   php_info_print_table_row(2, Host, d-host);
+
+   if (d-ssl_version) {
+   php_info_print_table_row(2, SSL Version, d-ssl_version);
+   }
+
+   if (d-libz_version) {
+   php_info_print_table_row(2, ZLib Version, d-libz_version);
+   }
+
+   if (d-libz_version) {
+   php_info_print_table_row(2, libIDN Version, d-libidn);
+   }
+   
+   if (d-iconv_ver_num) {
+   php_info_print_table_row(2, IconV Version, d-iconv_ver_num);
+   }
+
+   if (d-libssh_version) {
+   php_info_print_table_row(2, libSSH Version, 
d-libssh_version);
+   }
+
php_info_print_table_end();
 }
 /* }}} */



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

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

2008-07-29 Thread Antony Dovgal

tony2001Tue Jul 29 10:42:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.11r2=1.62.2.14.2.27.2.12diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.11 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.12
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.11Sat Jul 12 21:16:50 2008
+++ php-src/ext/curl/interface.cTue Jul 29 10:42:44 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.11 2008/07/12 21:16:50 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.12 2008/07/29 10:42:44 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1420,7 +1420,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;
@@ -1429,7 +1429,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_3) /ext/curl interface.c

2008-07-12 Thread Felipe Pena

felipe  Sat Jul 12 21:16:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  - MFB: 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.27.2.10r2=1.62.2.14.2.27.2.11diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.10 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.11
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.10Sat Jun 21 21:51:05 2008
+++ php-src/ext/curl/interface.cSat Jul 12 21:16:50 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.10 2008/06/21 21:51:05 indeyets Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.11 2008/07/12 21:16:50 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_3) /ext/curl interface.c

2008-06-21 Thread Alexey Zakhlestin

indeyetsSat Jun 21 21:51:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  updated to the new parameter-parsing api
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.9r2=1.62.2.14.2.27.2.10diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.9 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.10
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.9 Thu Feb  7 02:08:45 2008
+++ php-src/ext/curl/interface.cSat Jun 21 21:51:05 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.9 2008/02/07 02:08:45 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.10 2008/06/21 21:51:05 indeyets Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1149,15 +1149,15 @@
Copy a cURL handle along with all of it's preferences */
 PHP_FUNCTION(curl_copy_handle)
 {
-   zval **zid;
+   zval  *zid;
CURL  *cp;
php_curl  *ch;
php_curl  *dupch;
 
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, zid) == FAILURE) 
{
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, zid) == 
FAILURE) {
+   return;
}
-   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
cp = curl_easy_duphandle(ch-cp);
if (!cp) {
@@ -1609,18 +1609,17 @@
Set an option for a cURL transfer */
 PHP_FUNCTION(curl_setopt)
 {
-   zval   **zid, **zoption, **zvalue;
+   zval*zid, *zvalue;
+   longzoption;
php_curl*ch;
 
-   if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, zid, zoption, 
zvalue) == FAILURE) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rlz, zid, 
zoption, zvalue) == FAILURE) {
+   return;
}
 
-   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
-
-   convert_to_long_ex(zoption);
+   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
-   if (!_php_curl_setopt(ch, Z_LVAL_PP(zoption), zvalue, return_value 
TSRMLS_CC)) {
+   if (!_php_curl_setopt(ch, zoption, zvalue, return_value TSRMLS_CC)) {
RETURN_TRUE;
} else {
RETURN_FALSE;
@@ -1637,7 +1636,7 @@
longoption;
HashPositionpos;
char*string_key;
-   int str_key_len;
+   uintstr_key_len;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, za, zid, arr) 
== FAILURE) {
RETURN_FALSE;
@@ -1681,15 +1680,15 @@
Perform a cURL session */
 PHP_FUNCTION(curl_exec)
 {
-   zval  **zid;
+   zval   *zid;
php_curl   *ch;
CURLcodeerror;
 
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, zid) == FAILURE) 
{
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, zid) == 
FAILURE) {
+   return;
}
 
-   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
_php_curl_cleanup_handle(ch);

@@ -1723,16 +1722,16 @@
Get information regarding a specific transfer */
 PHP_FUNCTION(curl_getinfo)
 {
-   zval   **zid, 
-  **zoption;
+   zval*zid;
php_curl*ch;
-   int  option, argc = ZEND_NUM_ARGS();
+   int  argc = ZEND_NUM_ARGS();
+   long option;
 
-   if (argc  1 || argc  2 || zend_get_parameters_ex(argc, zid, 
zoption) == FAILURE) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(argc TSRMLS_CC, r|l, zid, option) == 
FAILURE) {
+   return;
}
 
-   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+   ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
if (argc  2) {
char   *s_code;
@@ -1807,7 +1806,6 @@
CAAS(request_header, ch-header.str);
}
} else {
-   option = Z_LVAL_PP(zoption);
switch (option) {
case CURLINFO_PRIVATE:
case CURLINFO_EFFECTIVE_URL: 
@@ -1872,14 +1870,14 @@
Return a string contain the last error for the current session */
 PHP_FUNCTION(curl_error)
 {
-   zval  **zid;
+   zval   *zid;
php_curl   *ch;

-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, zid) == FAILURE) 
{
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, zid) == 
FAILURE) {
+

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

2008-02-06 Thread Ilia Alshanetsky

iliaa   Thu Feb  7 02:08:45 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  
  New param parsing API
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.8r2=1.62.2.14.2.27.2.9diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.8 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.9
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.8 Sun Jan  6 17:12:44 2008
+++ php-src/ext/curl/interface.cThu Feb  7 02:08:45 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.8 2008/01/06 17:12:44 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.9 2008/02/07 02:08:45 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1085,18 +1085,17 @@
Initialize a cURL session */
 PHP_FUNCTION(curl_init)
 {
-   zval   **url;
php_curl*ch;
CURL*cp;
-   int  argc = ZEND_NUM_ARGS();
+   char*url = NULL;
+   int  url_len;
 
-   if (argc  0 || argc  1 || zend_get_parameters_ex(argc, url) == 
FAILURE) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, url, 
url_len) == FAILURE) {
+   return;
}
 
-   if (argc  0) {
-   convert_to_string_ex(url);
-   PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(url), Z_STRLEN_PP(url), 
(void) NULL);
+   if (url) {
+   PHP_CURL_CHECK_OPEN_BASEDIR(url, url_len, (void) NULL);
}
 
cp = curl_easy_init();
@@ -1133,10 +1132,10 @@
curl_easy_setopt(ch-cp, CURLOPT_NOSIGNAL, 1);
 #endif
 
-   if (argc  0) {
+   if (url) {
char *urlcopy;
 
-   urlcopy = estrndup(Z_STRVAL_PP(url), Z_STRLEN_PP(url));
+   urlcopy = estrndup(url, url_len);
curl_easy_setopt(ch-cp, CURLOPT_URL, urlcopy);
zend_llist_add_element(ch-to_free.str, urlcopy);
}

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

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

2008-01-06 Thread Ilia Alshanetsky

iliaa   Sun Jan  6 17:12:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  
  MFB: Fixed a safe_mode bypass in cURL identified by Maksymilian Arciemowicz.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.7r2=1.62.2.14.2.27.2.8diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.7 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.8
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.7 Mon Dec 31 07:17:06 2007
+++ php-src/ext/curl/interface.cSun Jan  6 17:12:44 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.7 2007/12/31 07:17:06 sebastian Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.8 2008/01/06 17:12:44 iliaa 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 (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);
\

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

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

2007-12-18 Thread Ilia Alshanetsky

iliaa   Tue Dec 18 13:46:07 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  Fixed bug #43620 (Workaround for a bug inside libcurl 7.16.2 that can result
  in a crash)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.5r2=1.62.2.14.2.27.2.6diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.5 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.6
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.5 Tue Dec  4 08:56:07 2007
+++ php-src/ext/curl/interface.cTue Dec 18 13:46:07 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.5 2007/12/04 08:56:07 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.6 2007/12/18 13:46:07 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -153,7 +153,7 @@
 
 #define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s), (long) v);
 #define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s), (double) v);
-#define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 
1);
+#define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) (v 
? v : ), 1);
 #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
 
 #if defined(PHP_WIN32) || defined(__GNUC__)

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

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

2007-12-04 Thread Antony Dovgal

tony2001Tue Dec  4 08:56:07 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.4r2=1.62.2.14.2.27.2.5diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.4 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.5
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.4 Fri Nov 16 14:21:01 2007
+++ php-src/ext/curl/interface.cTue Dec  4 08:56:07 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.4 2007/11/16 14:21:01 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.5 2007/12/04 08:56:07 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.7.2.1diff_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.7.2.1
--- 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:07 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.7.2.1 2007/12/04 08:56:07 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_3) /ext/curl interface.c

2007-11-16 Thread Jani Taskinen

janiFri Nov 16 14:21:01 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  MFH: - Fixed bug #43092 (curl_copy_handle() crashes with  32 chars long URL)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.3r2=1.62.2.14.2.27.2.4diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.3 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.4
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.3 Sat Oct 13 11:34:43 2007
+++ php-src/ext/curl/interface.cFri Nov 16 14:21:01 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.3 2007/10/13 11:34:43 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.4 2007/11/16 14:21:01 jani Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1074,9 +1074,9 @@

memset((*ch)-err, 0, sizeof((*ch)-err));

-   zend_llist_init((*ch)-to_free.str,   sizeof(char *),
(void(*)(void *)) curl_free_string, 0);
-   zend_llist_init((*ch)-to_free.slist, sizeof(struct curl_slist), 
(void(*)(void *)) curl_free_slist,  0);
-   zend_llist_init((*ch)-to_free.post,  sizeof(struct HttpPost),   
(void(*)(void *)) curl_free_post,   0);
+   zend_llist_init((*ch)-to_free.str,   sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
+   zend_llist_init((*ch)-to_free.slist, sizeof(struct curl_slist), 
(llist_dtor_func_t) curl_free_slist,  0);
+   zend_llist_init((*ch)-to_free.post,  sizeof(struct HttpPost),   
(llist_dtor_func_t) curl_free_post,   0);
 }
 /* }}} */
 
@@ -1204,6 +1204,8 @@
curl_easy_setopt(dupch-cp, CURLOPT_WRITEHEADER,   (void *) dupch);
 
zend_llist_copy(dupch-to_free.str, ch-to_free.str);
+   /* Don't try to free copied strings, they're free'd when the original 
handle is destroyed */
+   dupch-to_free.str.dtor = NULL;
zend_llist_copy(dupch-to_free.slist, ch-to_free.slist);
zend_llist_copy(dupch-to_free.post, ch-to_free.post);
 

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

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

2007-10-13 Thread Hannes Magnusson

bjori   Sat Oct 13 11:34:44 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  MFH: Fix typo and remove dots in error messages
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.2r2=1.62.2.14.2.27.2.3diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.2 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.3
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.2 Wed Oct  3 20:34:01 2007
+++ php-src/ext/curl/interface.cSat Oct 13 11:34:43 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.2 2007/10/03 20:34:01 mike Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.3 2007/10/13 11:34:43 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_3) /ext/curl interface.c

2007-10-03 Thread Michael Wallner

mikeWed Oct  3 20:34:01 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/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.27.2.1r2=1.62.2.14.2.27.2.2diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.1 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.2
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.1 Thu Sep 27 18:00:38 2007
+++ php-src/ext/curl/interface.cWed Oct  3 20:34:01 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.1 2007/09/27 18:00:38 dmitry Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.2 2007/10/03 20:34:01 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

58 matches

Mail list logo