diff --git a/cURL-safe.ecf b/cURL-safe.ecf
new file mode 100644
index 00000000..02b15b65
--- /dev/null
+++ b/cURL-safe.ecf
@@ -0,0 +1,93 @@
+
+
+
+ cURL: libcURL wrapper library for Eiffel.
+ Copyright (c) 1984-2006, Eiffel Software and others.
+ Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt).
+
+
+ /\.svn$
+ /EIFGEN.{0,1}$
+ /temp$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /spec$
+ /Clib$
+
+
+ /gtk$
+ /mac$
+
+
+
+
+
+ /mswin$
+ /gtk$
+
+
+
+
+
+
+ /mswin$
+ /mac$
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cURL.ecf b/cURL.ecf
index 885a50ce..0707e6ec 100644
--- a/cURL.ecf
+++ b/cURL.ecf
@@ -87,4 +87,7 @@
+
+
+
diff --git a/curl_easy_externals.e b/curl_easy_externals.e
index c91ced83..4ba6c0ee 100644
--- a/curl_easy_externals.e
+++ b/curl_easy_externals.e
@@ -202,7 +202,7 @@ feature -- Special setting
curl_function: CURL_FUNCTION
-- cURL functions in curl_easy_setopt.
do
- if attached {like curl_function} internal_curl_function as l_curl_function then
+ if attached internal_curl_function as l_curl_function then
Result := l_curl_function
else
create {CURL_DEFAULT_FUNCTION} Result.make
@@ -396,11 +396,11 @@ feature {NONE} -- C externals
note
library: "cURL: Library of reusable components for Eiffel."
- copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
+ copyright: "Copyright (c) 1984-2009, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
- 356 Storke Road, Goleta, CA 93117 USA
+ 5949 Hollister Ave., Goleta, CA 93117 USA
Telephone 805-685-1006, Fax 805-685-6869
Website http://www.eiffel.com
Customer support http://support.eiffel.com
diff --git a/curl_function.e b/curl_function.e
index 83ea6d3f..4d61bdc8 100644
--- a/curl_function.e
+++ b/curl_function.e
@@ -7,7 +7,7 @@ note
Note: descendants of this class have to call `set_object_and_function_address',
otherwise cURL would not know how to call Eiffel features (such as `write_function').
- See example: $ISE_LIBRARY\examples\cURL\upload_and_read_function
+ See example: $ISE_LIBRARY\examples\cURL\upload_and_read_function
]"
status: "See notice at end of class."
legal: "See notice at end of class."
@@ -187,11 +187,11 @@ feature {NONE} -- Implementation
note
library: "cURL: Library of reusable components for Eiffel."
- copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
+ copyright: "Copyright (c) 1984-2009, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
- 356 Storke Road, Goleta, CA 93117 USA
+ 5949 Hollister Ave., Goleta, CA 93117 USA
Telephone 805-685-1006, Fax 805-685-6869
Website http://www.eiffel.com
Customer support http://support.eiffel.com
diff --git a/curl_opt_constants.e b/curl_opt_constants.e
index b47d8742..8543514d 100644
--- a/curl_opt_constants.e
+++ b/curl_opt_constants.e
@@ -114,6 +114,16 @@ feature -- Enumerations.
]"
end
+ curlopt_cookielist: INTEGER
+ -- Declared as CURLOPT_COOKIELIST.
+ external
+ "C inline use "
+ alias
+ "[
+ return CURLOPT_COOKIELIST
+ ]"
+ end
+
curlopt_ssl_verifypeer: INTEGER
-- Declared as CURLOPT_SSL_VERIFYPEER.
external
@@ -286,11 +296,32 @@ feature -- Enumerations.
]"
end
+ curlopt_encoding: INTEGER
+ -- Declared as CURLOPT_ENCODING.
+ external
+ "C inline use "
+ alias
+ "[
+ return CURLOPT_ENCODING;
+ ]"
+ end
+
+ curlopt_timeout: INTEGER
+ -- Declared as CURLOPT_TIMEOUT.
+ external
+ "C inline use "
+ alias
+ "[
+ return CURLOPT_TIMEOUT
+ ]"
+ end
+
is_valid (a_integer: INTEGER): BOOLEAN
-- If `a_integer' value valid?
do
Result := a_integer = curlopt_cookie or
a_integer = curlopt_cookiefile or
+ a_integer = curlopt_cookielist or
a_integer = curlopt_debugfunction or
a_integer = curlopt_followlocation or
a_integer = curlopt_httpheader or
@@ -314,16 +345,18 @@ feature -- Enumerations.
a_integer = curlopt_put or
a_integer = curlopt_readdata or
a_integer = curlopt_infilesize_large or
- a_integer = curlopt_proxy
+ a_integer = curlopt_proxy or
+ a_integer = curlopt_encoding or
+ a_integer = curlopt_timeout
end
note
library: "cURL: Library of reusable components for Eiffel."
- copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
+ copyright: "Copyright (c) 1984-2009, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
- 356 Storke Road, Goleta, CA 93117 USA
+ 5949 Hollister Ave., Goleta, CA 93117 USA
Telephone 805-685-1006, Fax 805-685-6869
Website http://www.eiffel.com
Customer support http://support.eiffel.com