projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 1988b58d JB |
1 | --- php-5.2.0/ext/curl/interface.c.orig 2006-10-11 01:12:59.000000000 +0200 |
| 2 | +++ php-5.2.0/ext/curl/interface.c 2006-11-21 22:57:41.498291750 +0100 | |
| 3 | @@ -369,7 +369,9 @@ | |
| 4 | REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND); | |
| 5 | REGISTER_CURL_CONSTANT(CURLOPT_NETRC); | |
| 6 | REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION); | |
| 7 | +#if CURLOPT_FTPASCII != 0 | |
| 8 | REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII); | |
| 9 | +#endif | |
| 10 | REGISTER_CURL_CONSTANT(CURLOPT_PUT); | |
| 11 | #if CURLOPT_MUTE != 0 | |
| 12 | REGISTER_CURL_CONSTANT(CURLOPT_MUTE); | |
| 13 | @@ -409,7 +411,9 @@ | |
| 14 | REGISTER_CURL_CONSTANT(CURLOPT_FILETIME); | |
| 15 | REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION); | |
| 16 | REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION); | |
| 17 | +#if CURLOPT_PASSWDFUNCTION != 0 | |
| 18 | REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION); | |
| 19 | +#endif | |
| 20 | REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION); | |
| 21 | REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS); | |
| 22 | REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS); | |
| 23 | @@ -1158,11 +1162,13 @@ | |
| 24 | dupch->handlers->read->fp = ch->handlers->read->fp; | |
| 25 | dupch->handlers->read->fd = ch->handlers->read->fd; | |
| 26 | ||
| 27 | +#if CURLOPT_PASSWDDATA != 0 | |
| 28 | if (ch->handlers->passwd) { | |
| 29 | zval_add_ref(&ch->handlers->passwd); | |
| 30 | dupch->handlers->passwd = ch->handlers->passwd; | |
| 31 | curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch); | |
| 32 | } | |
| 33 | +#endif | |
| 34 | if (ch->handlers->write->func_name) { | |
| 35 | zval_add_ref(&ch->handlers->write->func_name); | |
| 36 | dupch->handlers->write->func_name = ch->handlers->write->func_name; |