php4-curl.patch

   1 --- php/ext/curl/curl.c.org     2006-12-03 16:57:28.028994500 +0100
   2 +++ php/ext/curl/curl.c 2006-12-03 16:58:44.241757500 +0100
   3 @@ -258,7 +258,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 @@ -296,7 +298,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 @@ -1092,7 +1096,7 @@
  24                         ch->handlers->write_header->func   = *zvalue;
  25                         ch->handlers->write_header->method = PHP_CURL_USER;
  26                         break;
  27 -#if CURLOPT_PASSWDFUNCTION != 0
  28 +#if CURLOPT_PASSWDFUNCTION != 0 && CURLOPT_PASSWDDATA != 0
  29                 case CURLOPT_PASSWDFUNCTION:
  30                         if (ch->handlers->passwd) {
  31                                 zval_ptr_dtor(&ch->handlers->passwd);