Moved items from TODO-RELEASE to TODO since they're not really bound to happen

in any specific release.

diff --git a/TODO-RELEASE b/TODO-RELEASE
index 2d0c5c5..c0d2403 100644 (file)
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1,40 +1,8 @@
 Issues not sorted in any particular order.
 
-To get fixed in 7.14.0 (planned release: May/June 2005)
+To get fixed in 7.14.1 (planned release: August 2005)
 ======================
 
-   - Make the tests run better on more platforms.
+60 - CONNECT 407 responses that kills the connection
 
-To get fixed in 7.14.1 (planned release: June 2005)
-======================
-
-58 - Fix KNOWN_BUGS #19: "FTP 3rd party transfers with the multi interface
-     doesn't work"
-
-47 - Peter Sylvester's patch for SRP on the TLS layer
-     Awaits OpenSSL support for this, no need to support this in libcurl before
-     there's an OpenSSL release that does it.
-
-To get fixed in 7.15.0
-======================
-
-55 - Add a function to the multi interface that gets file descriptors, as an
-     alternative to the curl_multi_fdset(). This is necessary to allow apps to
-     properly avoid the FD_SETSIZE problem.
-
-56 - Make curl_easy_perform() a wrapper-function that simply creates a multi
-     handle, adds the easy handle to it, runs curl_multi_perform() until the
-     transfer is done, then detach the easy handle, destroy the multi handle
-     and return the easy handle's return code. This will thus make everything
-     internally use and assume the multi interface. The select()-loop should
-     use the new function from (55).
-
-To get fixed in 7.16.0
-======================
-
-57 - Add an interface to libcurl for getting and setting cookies from an easy
-     handle. One idea: http://curl.haxx.se/mail/lib-2004-12/0195.html the
-     older idea: http://curl.haxx.se/dev/COOKIES. We need to settle on some
-     middle ground I guess.
-
-60 - 
+61 - 

diff --git a/docs/TODO b/docs/TODO
index 8a336ff..5678b9f 100644 (file)
--- a/docs/TODO
+++ b/docs/TODO
@@ -61,6 +61,17 @@ TODO
    ready to accept read data. Today libcurl feeds the data as soon as it is
    available for reading, no matter what.
 
+ * Add curl_multi_socket() and family to the multi interface that gets file
+   descriptors, as an alternative to the curl_multi_fdset(). This is necessary
+   to allow apps to properly avoid the FD_SETSIZE problem.
+
+ * Make curl_easy_perform() a wrapper-function that simply creates a multi
+   handle, adds the easy handle to it, runs curl_multi_perform() until the
+   transfer is done, then detach the easy handle, destroy the multi handle and
+   return the easy handle's return code. This will thus make everything
+   internally use and assume the multi interface. The select()-loop should use
+   curl_multi_socket().
+
  DOCUMENTATION
 
  * More and better
@@ -152,6 +163,10 @@ TODO
    latter two could be alternatives for those looking to reduce the footprint
    of libcurl built with OpenSSL or GnuTLS.
 
+ * Peter Sylvester's patch for SRP on the TLS layer.
+   Awaits OpenSSL support for this, no need to support this in libcurl before
+   there's an OpenSSL release that does it.
+
  LDAP
 
  * Look over the implementation. The looping will have to "go away" from the