diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec62deb9..b0e6546d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
## [Unreleased]
### Added
-- jwt: new JSON Web Token (JWT) library (supports for claim exp, iat, nbf, iss, aud).
+- `jwt`: new JSON Web Token (JWT) library (supports for claim exp, iat, nbf, iss, aud).
+- `http_client`: added support for ciphers setting in the libcurl implementation only.
+- `http_client`: added convenient `get` and `custom` functions on HTTP_CLIENT directly.
### Changed
+- adopted ecf version 1-16-0 and use a single .ecf file (the -safe.ecf are now redirection to normal .ecf)
### Deprecated
+- removed support for Eiffel version before 17.05 .
+- SSL 2 or 3 is obsolete and will raise an exception if used.
### Removed
### Fixed
- Removed a few obsolete calls.
- `http_client`: Added support for multiple file in form data. Made clear what is the meaning of `upload_filename`, `upload_data` and `form_data`.
+- `authentication`: HTTP_AUTHORIZATION acceps now READABLE_STRING_GENERAL for username and password argument.
+- `http_client`: fixed curl implementation by setting `Content-Type` to `x-www-form-urlencoded` (if not set) when POST send data as `x-www-form-urlencoded`.
### Security
diff --git a/README.md b/README.md
index 48b4a22b..c197614d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# Eiffel Web Framework
+[](https://travis-ci.org/EiffelWebFramework/EWF/)
+
## Overview
diff --git a/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf b/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
index c2b1849f..289614d5 100644
--- a/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
+++ b/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
@@ -1,22 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /CVS$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/contrib/library/network/server/nino/example/SimpleWebServer/web_server.ecf b/contrib/library/network/server/nino/example/SimpleWebServer/web_server.ecf
index e066115e..4e0dff0b 100644
--- a/contrib/library/network/server/nino/example/SimpleWebServer/web_server.ecf
+++ b/contrib/library/network/server/nino/example/SimpleWebServer/web_server.ecf
@@ -1,17 +1,19 @@
-
-
+
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
+
+
+
diff --git a/contrib/library/network/server/nino/nino-safe.ecf b/contrib/library/network/server/nino/nino-safe.ecf
index 233a68ac..fd148e3f 100644
--- a/contrib/library/network/server/nino/nino-safe.ecf
+++ b/contrib/library/network/server/nino/nino-safe.ecf
@@ -1,34 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /CVS$
- /EIFGENs$
-
-
-
-
-
-
-
-
- spec
-
-
- tcp_stream_socket.e
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/contrib/library/network/server/nino/nino.ecf b/contrib/library/network/server/nino/nino.ecf
index 7af610d1..d3b199ac 100644
--- a/contrib/library/network/server/nino/nino.ecf
+++ b/contrib/library/network/server/nino/nino.ecf
@@ -1,16 +1,16 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
+
+
+
diff --git a/contrib/library/network/server/nino/package.iron b/contrib/library/network/server/nino/package.iron
index 96514dcf..8f03dd5c 100644
--- a/contrib/library/network/server/nino/package.iron
+++ b/contrib/library/network/server/nino/package.iron
@@ -1,7 +1,6 @@
package nino
project
- nino = "nino-safe.ecf"
nino = "nino.ecf"
note
diff --git a/docs/workbook/basics/simple/simple.ecf b/docs/workbook/basics/simple/simple.ecf
index e4ff832f..6969354c 100644
--- a/docs/workbook/basics/simple/simple.ecf
+++ b/docs/workbook/basics/simple/simple.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/basics/simple_html/simple_html.ecf b/docs/workbook/basics/simple_html/simple_html.ecf
index 5712125d..90560a02 100644
--- a/docs/workbook/basics/simple_html/simple_html.ecf
+++ b/docs/workbook/basics/simple_html/simple_html.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/generating_response/exel/exel.ecf b/docs/workbook/generating_response/exel/exel.ecf
index e16eb9f7..1de3d559 100644
--- a/docs/workbook/generating_response/exel/exel.ecf
+++ b/docs/workbook/generating_response/exel/exel.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/generating_response/headers/headers.ecf b/docs/workbook/generating_response/headers/headers.ecf
index 797eb842..aa454c97 100644
--- a/docs/workbook/generating_response/headers/headers.ecf
+++ b/docs/workbook/generating_response/headers/headers.ecf
@@ -1,40 +1,49 @@
-
+
- /EIFGENs$
+ /\.svn$
/CVS$
- /.svn$
+ /EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/generating_response/search/search.ecf b/docs/workbook/generating_response/search/search.ecf
index 7c42d50b..e2726610 100644
--- a/docs/workbook/generating_response/search/search.ecf
+++ b/docs/workbook/generating_response/search/search.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/generating_response/status/status.ecf b/docs/workbook/generating_response/status/status.ecf
index de47b96a..3ef042b8 100644
--- a/docs/workbook/generating_response/status/status.ecf
+++ b/docs/workbook/generating_response/status/status.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/handling_cookies/example/example.ecf b/docs/workbook/handling_cookies/example/example.ecf
index dea25001..392f5e5a 100644
--- a/docs/workbook/handling_cookies/example/example.ecf
+++ b/docs/workbook/handling_cookies/example/example.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/handling_request/form/get/form.ecf b/docs/workbook/handling_request/form/get/form.ecf
index 8dde5e4d..bc6d5f4d 100644
--- a/docs/workbook/handling_request/form/get/form.ecf
+++ b/docs/workbook/handling_request/form/get/form.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/handling_request/form/post/form.ecf b/docs/workbook/handling_request/form/post/form.ecf
index bd83b4bd..7896ff19 100644
--- a/docs/workbook/handling_request/form/post/form.ecf
+++ b/docs/workbook/handling_request/form/post/form.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/handling_request/headers/browser_name/browsers.ecf b/docs/workbook/handling_request/headers/browser_name/browsers.ecf
index bb1df575..dbd46d58 100644
--- a/docs/workbook/handling_request/headers/browser_name/browsers.ecf
+++ b/docs/workbook/handling_request/headers/browser_name/browsers.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/handling_request/headers/cgi_variables/cgi_variables.ecf b/docs/workbook/handling_request/headers/cgi_variables/cgi_variables.ecf
index 8ba57e16..dd7143e3 100644
--- a/docs/workbook/handling_request/headers/cgi_variables/cgi_variables.ecf
+++ b/docs/workbook/handling_request/headers/cgi_variables/cgi_variables.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/handling_request/headers/header_fields/header_fields.ecf b/docs/workbook/handling_request/headers/header_fields/header_fields.ecf
index 39e2f8a0..75398bab 100644
--- a/docs/workbook/handling_request/headers/header_fields/header_fields.ecf
+++ b/docs/workbook/handling_request/headers/header_fields/header_fields.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/docs/workbook/handling_request/upload_file/upload.ecf b/docs/workbook/handling_request/upload_file/upload.ecf
index 0722e151..5b80a461 100644
--- a/docs/workbook/handling_request/upload_file/upload.ecf
+++ b/docs/workbook/handling_request/upload_file/upload.ecf
@@ -1,40 +1,49 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/draft/library/protocol/syndication/atom/atom-safe.ecf b/draft/library/protocol/syndication/atom/atom-safe.ecf
index 4af20c64..7df38e2e 100644
--- a/draft/library/protocol/syndication/atom/atom-safe.ecf
+++ b/draft/library/protocol/syndication/atom/atom-safe.ecf
@@ -1,16 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
+
+
diff --git a/draft/library/protocol/syndication/atom/atom.ecf b/draft/library/protocol/syndication/atom/atom.ecf
index c5805e0f..17e504b6 100644
--- a/draft/library/protocol/syndication/atom/atom.ecf
+++ b/draft/library/protocol/syndication/atom/atom.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/draft/library/protocol/syndication/rss/rss-safe.ecf b/draft/library/protocol/syndication/rss/rss-safe.ecf
index 83620c87..9b7b63a9 100644
--- a/draft/library/protocol/syndication/rss/rss-safe.ecf
+++ b/draft/library/protocol/syndication/rss/rss-safe.ecf
@@ -1,16 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
+
+
diff --git a/draft/library/protocol/syndication/rss/rss.ecf b/draft/library/protocol/syndication/rss/rss.ecf
index e039a0df..1f90cd51 100644
--- a/draft/library/protocol/syndication/rss/rss.ecf
+++ b/draft/library/protocol/syndication/rss/rss.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/draft/library/security/oauth/oauth-safe.ecf b/draft/library/security/oauth/oauth-safe.ecf
index f01b254a..62eba3dd 100644
--- a/draft/library/security/oauth/oauth-safe.ecf
+++ b/draft/library/security/oauth/oauth-safe.ecf
@@ -1,16 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
+
+
diff --git a/draft/library/security/oauth/oauth.ecf b/draft/library/security/oauth/oauth.ecf
index 8550c8d4..fe5ce27f 100644
--- a/draft/library/security/oauth/oauth.ecf
+++ b/draft/library/security/oauth/oauth.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/draft/library/server/wsf_js_widget/examples/custom-template/js_widget_template.ecf b/draft/library/server/wsf_js_widget/examples/custom-template/js_widget_template.ecf
index 04cb2f1a..0ebbc126 100644
--- a/draft/library/server/wsf_js_widget/examples/custom-template/js_widget_template.ecf
+++ b/draft/library/server/wsf_js_widget/examples/custom-template/js_widget_template.ecf
@@ -1,33 +1,32 @@
-
+
- /.git$
+ /\.git$
/CVS$
/EIFGENs$
-
-
-
-
-
-
+
+
+
+
-
+
-
+
-
+
diff --git a/draft/library/server/wsf_js_widget/examples/custom/js_widget_custom.ecf b/draft/library/server/wsf_js_widget/examples/custom/js_widget_custom.ecf
index 58a8446a..46b01a28 100644
--- a/draft/library/server/wsf_js_widget/examples/custom/js_widget_custom.ecf
+++ b/draft/library/server/wsf_js_widget/examples/custom/js_widget_custom.ecf
@@ -1,33 +1,32 @@
-
+
- /.git$
+ /\.git$
/CVS$
/EIFGENs$
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
diff --git a/draft/library/server/wsf_js_widget/examples/demo/demo.ecf b/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
index 0946ac0d..be5a8ee8 100644
--- a/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
+++ b/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
@@ -1,44 +1,52 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf b/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
index f4239f00..efc5a4a2 100644
--- a/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -1,21 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/draft/library/server/wsf_js_widget/wsf_js_widget.ecf b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
index 8b1afe1f..22d11934 100644
--- a/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/draft/src/gewf/gewf.ecf b/draft/src/gewf/gewf.ecf
index 104e7e13..3524f370 100644
--- a/draft/src/gewf/gewf.ecf
+++ b/draft/src/gewf/gewf.ecf
@@ -1,22 +1,21 @@
-
+
Generator for EWF project
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
-
-
-
-
+
+
+
+
diff --git a/examples/_update_needed/filter/filter.ecf b/examples/_update_needed/filter/filter.ecf
index 8fc170e0..30112b5c 100644
--- a/examples/_update_needed/filter/filter.ecf
+++ b/examples/_update_needed/filter/filter.ecf
@@ -1,33 +1,34 @@
-
+
/EIFGENs$
/\.git$
/\.svn$
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
diff --git a/examples/debug/debug.ecf b/examples/debug/debug.ecf
index 7bbda930..3365d92b 100644
--- a/examples/debug/debug.ecf
+++ b/examples/debug/debug.ecf
@@ -1,47 +1,44 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
-
-
+
-
+
-
+
diff --git a/examples/desktop_app/desktop_app.ecf b/examples/desktop_app/desktop_app.ecf
index df08bef2..32bd16df 100644
--- a/examples/desktop_app/desktop_app.ecf
+++ b/examples/desktop_app/desktop_app.ecf
@@ -1,23 +1,22 @@
-
+
Vision2+web browser widget+embedded web service
This example demonstrates how to build a vision2 desktop application that embed a web browser accessing the service of an embedded web service.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
diff --git a/examples/form/form.ecf b/examples/form/form.ecf
index 59c01c12..1c912357 100644
--- a/examples/form/form.ecf
+++ b/examples/form/form.ecf
@@ -1,52 +1,54 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
-
+
+
+
-
+
+
+
-
-
+
-
-
+
diff --git a/examples/obsolete/v0/filter/filter-safe.ecf b/examples/obsolete/v0/filter/filter.ecf
similarity index 56%
rename from examples/obsolete/v0/filter/filter-safe.ecf
rename to examples/obsolete/v0/filter/filter.ecf
index 5e872262..5b26d48d 100644
--- a/examples/obsolete/v0/filter/filter-safe.ecf
+++ b/examples/obsolete/v0/filter/filter.ecf
@@ -1,35 +1,41 @@
-
+
/EIFGENs$
/\.git$
/\.svn$
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
-
diff --git a/examples/obsolete/v0/restbucksCRUD/client/client-safe.ecf b/examples/obsolete/v0/restbucksCRUD/client/client-safe.ecf
deleted file mode 100644
index dc8c3362..00000000
--- a/examples/obsolete/v0/restbucksCRUD/client/client-safe.ecf
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/obsolete/v0/restbucksCRUD/client/client.ecf b/examples/obsolete/v0/restbucksCRUD/client/client.ecf
index 3e2cc430..f60278f9 100644
--- a/examples/obsolete/v0/restbucksCRUD/client/client.ecf
+++ b/examples/obsolete/v0/restbucksCRUD/client/client.ecf
@@ -1,17 +1,20 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
+
+
+
+
-
+
diff --git a/examples/obsolete/v0/restbucksCRUD/restbucks-safe.ecf b/examples/obsolete/v0/restbucksCRUD/restbucks.ecf
similarity index 62%
rename from examples/obsolete/v0/restbucksCRUD/restbucks-safe.ecf
rename to examples/obsolete/v0/restbucksCRUD/restbucks.ecf
index a661a6be..486593f8 100644
--- a/examples/obsolete/v0/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/obsolete/v0/restbucksCRUD/restbucks.ecf
@@ -1,35 +1,35 @@
-
-
+
+
/EIFGENs$
/\.git$
/\.svn$
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
@@ -41,11 +41,11 @@
-
-
+
/resource$
diff --git a/examples/proxy/proxy.ecf b/examples/proxy/proxy.ecf
index 9907d2c7..60078dd8 100644
--- a/examples/proxy/proxy.ecf
+++ b/examples/proxy/proxy.ecf
@@ -1,29 +1,27 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
+
+
+
+
-
-
-
+
diff --git a/examples/rest/restbucks_CRUD/client/client.ecf b/examples/rest/restbucks_CRUD/client/client.ecf
index 3314de3e..68c37214 100644
--- a/examples/rest/restbucks_CRUD/client/client.ecf
+++ b/examples/rest/restbucks_CRUD/client/client.ecf
@@ -1,19 +1,18 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
-
-
-
+
+
+
diff --git a/examples/rest/restbucks_CRUD/restbucks.ecf b/examples/rest/restbucks_CRUD/restbucks.ecf
index a4a5b870..d755f5f2 100644
--- a/examples/rest/restbucks_CRUD/restbucks.ecf
+++ b/examples/rest/restbucks_CRUD/restbucks.ecf
@@ -1,33 +1,29 @@
-
+
/EIFGENs$
/\.git$
/\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -38,11 +34,10 @@
-
-
+
/resource/order_handler.e$
diff --git a/examples/rest/restbucks_CRUD/support/simple_db/simple_db-safe.ecf b/examples/rest/restbucks_CRUD/support/simple_db/simple_db-safe.ecf
index f0ac5ee5..6f5f13b5 100644
--- a/examples/rest/restbucks_CRUD/support/simple_db/simple_db-safe.ecf
+++ b/examples/rest/restbucks_CRUD/support/simple_db/simple_db-safe.ecf
@@ -1,25 +1,3 @@
-
-
-
-
-
-
-
-
-
- /.*json.*\.e$
-
-
-
-
-
- /basic_memory_database\.e$
-
-
-
-
-
-
-
+
+
diff --git a/examples/rest/restbucks_CRUD/support/simple_db/simple_db.ecf b/examples/rest/restbucks_CRUD/support/simple_db/simple_db.ecf
index f46af389..dfab8053 100644
--- a/examples/rest/restbucks_CRUD/support/simple_db/simple_db.ecf
+++ b/examples/rest/restbucks_CRUD/support/simple_db/simple_db.ecf
@@ -1,10 +1,9 @@
-
+
-
-
diff --git a/examples/rest/restbucks_CRUD/support/simple_db/tests/test_simple_db.ecf b/examples/rest/restbucks_CRUD/support/simple_db/tests/test_simple_db.ecf
index 029db293..92229cb2 100644
--- a/examples/rest/restbucks_CRUD/support/simple_db/tests/test_simple_db.ecf
+++ b/examples/rest/restbucks_CRUD/support/simple_db/tests/test_simple_db.ecf
@@ -1,19 +1,18 @@
-
+
-
- /\.svn$
- /\.git$
- /EIFGENs$
-
-
-
-
-
-
-
+
+
+
+
/.*json.*\.e$
@@ -30,7 +29,8 @@
-
+
+
+
-
diff --git a/examples/simple/simple.ecf b/examples/simple/simple.ecf
index 69b4f647..2ed26bf1 100644
--- a/examples/simple/simple.ecf
+++ b/examples/simple/simple.ecf
@@ -1,50 +1,51 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
+
+
+
-
-
-
+
-
+
+
+
-
+
+
+
-
-
+
-
-
+
diff --git a/examples/simple_file/service_file.ecf b/examples/simple_file/service_file.ecf
index ebce8652..8a7c9c46 100644
--- a/examples/simple_file/service_file.ecf
+++ b/examples/simple_file/service_file.ecf
@@ -1,18 +1,17 @@
-
+
-
-
-
-
-
-
+
+
+
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
diff --git a/examples/simple_ssl/simple_ssl.ecf b/examples/simple_ssl/simple_ssl.ecf
index 480afec5..e8de6d51 100644
--- a/examples/simple_ssl/simple_ssl.ecf
+++ b/examples/simple_ssl/simple_ssl.ecf
@@ -1,27 +1,27 @@
-
+
Simple EiffelWeb standalone server with SSL support (Concurrent connection supported thanks to SCOOP).
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
+
+
+
+
Simple EiffelWeb standalone server with SSL support (Single threaded, thus no concurrent connection.)
-
+
+
+
diff --git a/examples/simple_ssl/test/test.e b/examples/simple_ssl/test/test.e
new file mode 100644
index 00000000..595354db
--- /dev/null
+++ b/examples/simple_ssl/test/test.e
@@ -0,0 +1,44 @@
+note
+ description: "[
+ Enter class description here!
+ ]"
+
+class
+ TEST
+
+create
+ make
+
+feature {NONE} -- Initialization
+
+ make
+ -- Instantiate Current object.
+ do
+ execute
+ end
+
+feature -- Execution
+
+ execute
+ local
+ l_socket: NETWORK_STREAM_SOCKET
+ l_packet: PACKET
+ do
+ create l_socket.make_client_by_port(9090, "localhost")
+ l_socket.connect
+
+ create l_packet.make(1)
+ l_packet.put_element('a', 0)
+
+ l_socket.send(l_packet, 0)
+
+ from
+
+ until
+ not l_socket.is_connected
+ loop
+
+ end
+ end
+
+end
diff --git a/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf b/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
index 4f0039cb..c29cff20 100644
--- a/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
+++ b/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
@@ -1,19 +1,18 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
+
+
+
diff --git a/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf b/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
index 0783b1c5..4b5e9134 100644
--- a/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
+++ b/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
@@ -1,19 +1,18 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
+
+
+
diff --git a/examples/tutorial/step_2/hello/hello.ecf b/examples/tutorial/step_2/hello/hello.ecf
index 951cb803..0fa2b569 100644
--- a/examples/tutorial/step_2/hello/hello.ecf
+++ b/examples/tutorial/step_2/hello/hello.ecf
@@ -1,37 +1,38 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
+
+
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
+
+
+
-
-
-
+
+
+
diff --git a/examples/tutorial/step_3/hello/hello.ecf b/examples/tutorial/step_3/hello/hello.ecf
index e5d78703..6533a1d8 100644
--- a/examples/tutorial/step_3/hello/hello.ecf
+++ b/examples/tutorial/step_3/hello/hello.ecf
@@ -1,20 +1,19 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
+
+
+
diff --git a/examples/tutorial/step_4/hello/hello.ecf b/examples/tutorial/step_4/hello/hello.ecf
index 23b128c7..360638da 100644
--- a/examples/tutorial/step_4/hello/hello.ecf
+++ b/examples/tutorial/step_4/hello/hello.ecf
@@ -1,21 +1,20 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/examples/upload_image/upload_image.ecf b/examples/upload_image/upload_image.ecf
index 322ba3ce..4bdcdeba 100644
--- a/examples/upload_image/upload_image.ecf
+++ b/examples/upload_image/upload_image.ecf
@@ -1,38 +1,37 @@
-
+
/EIFGENs$
/\.git$
/\.svn$
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
-
+
+
+
-
-
+
+
+
+
-
-
-
diff --git a/examples/websocket/websocket_app.ecf b/examples/websocket/websocket_app.ecf
index 0718f32a..d14ca0d8 100644
--- a/examples/websocket/websocket_app.ecf
+++ b/examples/websocket/websocket_app.ecf
@@ -1,21 +1,20 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
+
+
+
+
diff --git a/library/network/http_client/README.md b/library/network/http_client/README.md
index 288ad58d..26d18b85 100644
--- a/library/network/http_client/README.md
+++ b/library/network/http_client/README.md
@@ -10,6 +10,9 @@ It provides simple routine to perform http requests, and get response.
- Eiffel Net library
- and optionally Eiffel NetSSL library to support `https://...`
+* Note: set ciphers setting is supported only with libcurl implementation for now, net implementation
+set all the ciphers as part of the OpenSSL initialization.
+
This means on Windows, do not forget to copy the libcurl.dll (and related) either in the same directory of the executable, or ensure the .dll are in the PATH environment.
It is possible to exclude the libcurl implementation xor the Eiffel Net implementation:
diff --git a/library/network/http_client/http_client-safe.ecf b/library/network/http_client/http_client-safe.ecf
index 05a0e1c5..2f35b985 100644
--- a/library/network/http_client/http_client-safe.ecf
+++ b/library/network/http_client/http_client-safe.ecf
@@ -1,80 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/network/http_client/http_client.ecf b/library/network/http_client/http_client.ecf
index 2a10f2d4..58aee379 100644
--- a/library/network/http_client/http_client.ecf
+++ b/library/network/http_client/http_client.ecf
@@ -1,15 +1,12 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
@@ -33,8 +30,8 @@
-
-
+
+
diff --git a/library/network/http_client/libcurl_http_client-safe.ecf b/library/network/http_client/libcurl_http_client-safe.ecf
index 4357f834..4cd298a1 100644
--- a/library/network/http_client/libcurl_http_client-safe.ecf
+++ b/library/network/http_client/libcurl_http_client-safe.ecf
@@ -1,26 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/network/http_client/libcurl_http_client.ecf b/library/network/http_client/libcurl_http_client.ecf
index 8ad508ab..b3eaee60 100644
--- a/library/network/http_client/libcurl_http_client.ecf
+++ b/library/network/http_client/libcurl_http_client.ecf
@@ -1,15 +1,12 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
@@ -17,8 +14,8 @@
-
-
+
+
diff --git a/library/network/http_client/net_http_client-safe.ecf b/library/network/http_client/net_http_client-safe.ecf
index 544b0c73..007a6d29 100644
--- a/library/network/http_client/net_http_client-safe.ecf
+++ b/library/network/http_client/net_http_client-safe.ecf
@@ -1,37 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/network/http_client/net_http_client.ecf b/library/network/http_client/net_http_client.ecf
index 5276d4ce..9c8d96dd 100644
--- a/library/network/http_client/net_http_client.ecf
+++ b/library/network/http_client/net_http_client.ecf
@@ -1,15 +1,12 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
@@ -26,8 +23,8 @@
-
-
+
+
diff --git a/library/network/http_client/package.iron b/library/network/http_client/package.iron
index d0035f8b..46b23ee3 100644
--- a/library/network/http_client/package.iron
+++ b/library/network/http_client/package.iron
@@ -1,22 +1,20 @@
package http_client
project
- http_client = "http_client-safe.ecf"
http_client = "http_client.ecf"
- libcurl_http_client = "libcurl_http_client-safe.ecf"
libcurl_http_client = "libcurl_http_client.ecf"
- net_http_client = "net_http_client-safe.ecf"
net_http_client = "net_http_client.ecf"
note
title: HTTP client
- description: "[
- Provides simple routines to perform http requests, and get associated response.
- It has two implementations:
- - using Eiffel cURL (i.e libcurl)
- - using EiffelNET (and the EiffelNET SSL extension)
- ]"
- collection:EWF
+ description: "[
+Provides simple routines to perform http requests, and get associated response.
+It has two implementations:
+ - using Eiffel cURL (i.e libcurl)
+ - using EiffelNET (and the EiffelNET SSL extension)
+ ]"
+
+ collection: EWF
tags: http,client,network,request,web,curl,EWF
copyright: 1984-2016 Eiffel Software and others
license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
diff --git a/library/network/http_client/src/http_client_request.e b/library/network/http_client/src/http_client_request.e
index 3f282249..c2217bf2 100644
--- a/library/network/http_client/src/http_client_request.e
+++ b/library/network/http_client/src/http_client_request.e
@@ -30,8 +30,15 @@ feature {NONE} -- Initialization
-- Initialize Current with `a_url' and `ctx'.
-- This can be used to reset/reinitialize Current with new url
-- in the case of redirection.
+ local
+ i: INTEGER
do
- if a_url.starts_with ("http://") or a_url.starts_with ("http://") then
+ i := a_url.substring_index ("://", 1)
+ if i > 0 then
+ check
+ a_url.substring (1, i).same_string ("http")
+ or a_url.substring (1, i).same_string ("https")
+ end
url := a_url
else
url := session.url (a_url, Void)
diff --git a/library/network/http_client/src/http_client_session.e b/library/network/http_client/src/http_client_session.e
index 5272173e..e0b469dc 100644
--- a/library/network/http_client/src/http_client_session.e
+++ b/library/network/http_client/src/http_client_session.e
@@ -272,6 +272,14 @@ feature -- Authentication
-- Associated optional credentials value.
-- Computed as `username':`password'.
+ ciphers_setting: detachable READABLE_STRING_8
+ -- SSL cipher preference lists
+ -- examples: DEFAULT, ALL, TLSv1
+ -- check https://www.openssl.org/docs/man1.1.0/apps/ciphers.html
+ -- Warning: At the moment only used for LIB_CURL_HTTP_CLIENT
+ -- Net implementation set all the ciphers using the OpenSSL at
+ -- initialization time.
+
feature -- Status setting
set_is_debug (b: BOOLEAN)
@@ -401,6 +409,14 @@ feature -- Element change
chunk_size := a_size
end
+ set_ciphers_setting (a_ciphers_setting: READABLE_STRING_8)
+ -- Set 'ciphers_setting' with 'a_ciphers_setting'.
+ do
+ create {STRING_8} ciphers_setting.make_from_string (a_ciphers_setting)
+ ensure
+ ciphers_setting_set: attached ciphers_setting as c_setting and then c_setting.same_string (a_ciphers_setting)
+ end
+
note
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
index 13e44bbb..4c540501 100644
--- a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
+++ b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
@@ -206,7 +206,10 @@ feature -- Execution
l_use_curl_form := True
end
else
+ l_headers.force ("application/x-www-form-urlencoded", "Content-Type")
l_upload_data := ctx.form_parameters_to_x_www_form_url_encoded_string
+ curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_postfields, l_upload_data)
+ curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_postfieldsize, l_upload_data.count)
end
if l_use_curl_form then
create l_form.make
@@ -372,6 +375,11 @@ feature -- Execution
curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_ssl_verifypeer, 0)
end
+ --| Cipher List
+ if attached session.ciphers_setting as c_list then
+ curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_ssl_cipher_list, c_list )
+ end
+
--| Request method
if request_method.is_case_insensitive_equal ("GET") then
curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_httpget, 1)
diff --git a/library/network/http_client/tests/test.ecf b/library/network/http_client/tests/test.ecf
index 49622c2a..e15b06de 100644
--- a/library/network/http_client/tests/test.ecf
+++ b/library/network/http_client/tests/test.ecf
@@ -1,26 +1,29 @@
-
-
+
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
+
+
+
-
-
+
+
-
+
.*libcurl_.*.e$
diff --git a/library/network/http_network/http_network-safe.ecf b/library/network/http_network/http_network-safe.ecf
index a4d43db7..4d5d09f5 100644
--- a/library/network/http_network/http_network-safe.ecf
+++ b/library/network/http_network/http_network-safe.ecf
@@ -1,126 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /http_stream_socket_ext.e$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /http_stream_secure_socket_ext.e$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/network/http_network/http_network.ecf b/library/network/http_network/http_network.ecf
index f26e44c5..d6b4e52c 100644
--- a/library/network/http_network/http_network.ecf
+++ b/library/network/http_network/http_network.ecf
@@ -1,124 +1,38 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
-
- /http_stream_socket_ext.e$
-
-
-
-
-
-
-
-
-
-
-
-
-
- /http_stream_secure_socket_ext.e$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/library/network/http_network/spec/include_until_16_05/ew_network.h b/library/network/http_network/spec/include_until_16_05/ew_network.h
deleted file mode 100644
index 0313fbae..00000000
--- a/library/network/http_network/spec/include_until_16_05/ew_network.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-indexing
- description: "Functions used by the EiffelWeb http networking classes. "
- copyright: "Copyright (c) 2011-2016, Jocelyn Fiat, Eiffel Software and others"
- license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
- source: "[
- Eiffel Software
- 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
- ]"
-*/
-
-#ifndef _ew_network_h_
-#define _ew_network_h_
-
-#include "eif_config.h"
-
-#ifdef EIF_WINDOWS
-# ifndef _WINSOCKAPI_
-# define FD_SETSIZE 256
-# include
-# include
-# include
-# endif
-#else /* unix-specific */
-# include
-# include
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* extern declarations ... */
-#ifdef EIF_WINDOWS
-extern int setsockopt(int, int, int, char*, int);
-extern int recv(int, char *, int, int);
-extern int send(int, char *, int, int);
-#else
-extern int setsockopt(int, int, int, const void*, socklen_t);
-extern ssize_t recv(int, void *, size_t, int);
-extern ssize_t send(int, const void *, size_t, int);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/library/network/http_network/src/http_stream_socket.e b/library/network/http_network/src/http_stream_socket.e
index 0e726744..997a47ec 100644
--- a/library/network/http_network/src/http_stream_socket.e
+++ b/library/network/http_network/src/http_stream_socket.e
@@ -9,8 +9,6 @@ class
inherit
NETWORK_STREAM_SOCKET
- HTTP_STREAM_SOCKET_EXT
-
create
make, make_empty,
make_client_by_port, make_client_by_address_and_port,
diff --git a/library/network/http_network/src/http_stream_socket_ext.e b/library/network/http_network/src/http_stream_socket_ext.e
deleted file mode 100644
index 6784d023..00000000
--- a/library/network/http_network/src/http_stream_socket_ext.e
+++ /dev/null
@@ -1,21 +0,0 @@
-note
- description: "[
- Extension to HTTPD_STREAM_SOCKET to support backward compatibility.
-
- TO BE REMOVED IN THE FUTURE, When there is no need to support older compilers.
- ]"
-
-deferred class
- HTTP_STREAM_SOCKET_EXT
-
-note
- copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
- license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
- source: "[
- Eiffel Software
- 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
- ]"
-end
diff --git a/library/network/http_network/src/until_16_05/http_stream_socket_ext.e b/library/network/http_network/src/until_16_05/http_stream_socket_ext.e
deleted file mode 100644
index e1afb655..00000000
--- a/library/network/http_network/src/until_16_05/http_stream_socket_ext.e
+++ /dev/null
@@ -1,174 +0,0 @@
-note
- description: "[
- Until 16.05, the EiffelNet socket interface DOES NOT have
- - make_server_by_address_and_port
- - recv_timeout
- - send_timeout.
-
- TO BE REMOVED IN THE FUTURE, WHEN 16.05 IS OLD.
- ]"
-
-deferred class
- HTTP_STREAM_SOCKET_EXT
-
-inherit
- PLATFORM
-
-feature -- Initialization
-
- make
- deferred
- end
-
- make_server_by_address_and_port (a_address: INET_ADDRESS; a_port: INTEGER)
- -- Create server socket on `a_address' and `a_port'.
- require
- valid_port: a_port >= 0
- do
- make
- set_address (create {like address_type}.make_from_address_and_port (a_address, a_port))
- bind
- end
-
-feature -- Basic operation
-
- bind
- deferred
- end
-
-feature -- Access
-
- set_address (addr: detachable like address_type)
- deferred
- end
-
- address_type: NETWORK_SOCKET_ADDRESS
- deferred
- end
-
- descriptor: INTEGER
- -- Socket descriptor of current socket
- deferred
- end
-
- socket_buffer: MANAGED_POINTER
- deferred
- end
-
- read_socket_buffer: MANAGED_POINTER
- do
- Result := socket_buffer
- end
-
- put_socket_buffer: MANAGED_POINTER
- do
- Result := socket_buffer
- end
-
-feature -- Socket Recv and Send timeout.
-
- set_recv_timeout (a_timeout_seconds: INTEGER)
- -- Set the receive timeout in seconds on Current socket.
- -- if `0' the related operations will never timeout.
- require
- positive_timeout: a_timeout_seconds >= 0
- do
- c_set_sock_recv_timeout (descriptor, level_sol_socket, a_timeout_seconds)
- end
-
- set_send_timeout (a_timeout_seconds: INTEGER)
- -- Set the send timeout in milliseconds on Current socket.
- -- if `0' the related operations will never timeout.
- require
- positive_timeout: a_timeout_seconds >= 0
- do
- c_set_sock_send_timeout (descriptor, level_sol_socket, a_timeout_seconds)
- end
-
-feature {NONE} -- Externals
-
- level_sol_socket: INTEGER
- -- SOL_SOCKET level of options
- deferred
- end
-
- c_set_sock_recv_timeout (a_fd, a_level: INTEGER; a_timeout_seconds: INTEGER)
- -- C routine to set socket option `SO_RCVTIMEO' with `a_timeout_seconds' seconds.
- external
- "C inline use %"ew_network.h%""
- alias
- "[
-#ifdef SO_RCVTIMEO
- int flag = SO_RCVTIMEO;
-#else
- int flag = 0x1006;
-#endif
-
-#ifdef EIF_WINDOWS
- int arg = (int) 1000 * $a_timeout_seconds; /* Timeout in milliseconds */
- setsockopt((int) $a_fd, (int) $a_level, flag, (char *) &arg, sizeof(arg));
-#else
- struct timeval tv;
- tv.tv_sec = $a_timeout_seconds; /* Timeout in seconds */
- tv.tv_usec = 0;
- setsockopt((int) $a_fd, (int) $a_level, flag, (struct timeval *)&tv, sizeof(struct timeval));
-#endif
- ]"
- end
-
- c_set_sock_send_timeout (a_fd, a_level: INTEGER; a_timeout_seconds: INTEGER)
- -- C routine to set socket option `SO_SNDTIMEO' with `a_timeout_seconds' seconds.
- external
- "C inline use %"ew_network.h%""
- alias
- "[
-#ifdef SO_RCVTIMEO
- int flag = SO_SNDTIMEO;
-#else
- int flag = 0x1005;
-#endif
-#ifdef EIF_WINDOWS
- int arg = (int) 1000 * $a_timeout_seconds; /* Timeout in milliseconds */
- setsockopt((int) $a_fd, (int) $a_level, flag, (char *) &arg, sizeof(arg));
-#else
- struct timeval tv;
- tv.tv_sec = $a_timeout_seconds; /* Timeout in seconds */
- tv.tv_usec = 0;
- setsockopt((int) $a_fd, (int) $a_level, flag, (struct timeval *)&tv, sizeof(struct timeval));
-#endif
- ]"
- end
-
-feature {NONE} -- No-Exception network operation
-
- c_recv_noexception (a_fd: INTEGER; buf: POINTER; len: INTEGER; flags: INTEGER): INTEGER
- -- External routine to read a `len' number of characters
- -- into buffer `buf' from socket `a_fd' with options `flags'.
- external
- "C inline use %"ew_network.h%""
- alias
- "[
- recv((int) $a_fd, (char *) $buf, (int) $len, (int) $flags)
- ]"
- end
-
- c_read_stream_noexception (a_fd: INTEGER; len: INTEGER; buf: POINTER): INTEGER
- -- External routine to read a `len' number of characters
- -- into buffer `buf' from socket `a_fd'.
- do
- Result := c_recv_noexception (a_fd, buf, len, 0)
- end
-
- c_put_stream_noexception (a_fd: INTEGER; buf: POINTER; len: INTEGER): INTEGER
- -- External routine to write stream pointed by `s' of
- -- length `length' to socket `fd'.
- -- Note: does not raise exception on error, but return error value as Result.
- external
- "C inline use %"ew_network.h%""
- alias
- "[
- send((int) $a_fd, (char *) $buf, (int) $len, (int) 0)
- ]"
- end
-
-end
diff --git a/library/network/http_network/src/until_16_05/ssl/http_stream_secure_socket_ext.e b/library/network/http_network/src/until_16_05/ssl/http_stream_secure_socket_ext.e
deleted file mode 100644
index 6edcc3f2..00000000
--- a/library/network/http_network/src/until_16_05/ssl/http_stream_secure_socket_ext.e
+++ /dev/null
@@ -1,41 +0,0 @@
-note
- description: "[
- Extension to HTTP_STREAM_SOCKET to support backward compatibility.
-
- TO BE REMOVED IN THE FUTURE, WHEN 16.05 IS OLD.
- ]"
-
-deferred class
- HTTP_STREAM_SECURE_SOCKET_EXT
-
-feature {NONE} -- SSL bridge
-
- ssl_write (a_ssl: SSL; a_pointer: POINTER; a_byte_count: INTEGER): INTEGER
- do
- -- In delivery until 16.05
- -- SSL.write does not return any value!
- -- So let's use `c_ssl_write' from Current class
- -- instead of:
- -- a_ssl.write (a_pointer, a_byte_count)
-
- Result := c_ssl_write (a_ssl.ptr, a_pointer, a_byte_count)
- if a_ssl.was_error then
- -- Until 16.05, there is no error check for `SSL.write'
- -- so nothing can be done here.
-
- if Result >= 0 then
- Result := -1
- end
- end
- end
-
- c_ssl_write (an_ssl_ptr: POINTER; buffer: POINTER; nb_bytes: INTEGER_32): INTEGER_32
- -- External call to SSL_write
- -- (export status {NONE})
- external
- "C use %"eif_openssl.h%""
- alias
- "SSL_write"
- end
-
-end
diff --git a/library/network/http_network/src/until_17_01/http_stream_socket_ext.e b/library/network/http_network/src/until_17_01/http_stream_socket_ext.e
deleted file mode 100644
index 4fd8c60c..00000000
--- a/library/network/http_network/src/until_17_01/http_stream_socket_ext.e
+++ /dev/null
@@ -1,29 +0,0 @@
-note
- description: "[
- Extension to HTTPD_STREAM_SOCKET to support backward compatibility.
-
- TO BE REMOVED IN THE FUTURE, WHEN 17.01 IS OLD.
- ]"
-
-deferred class
- HTTP_STREAM_SOCKET_EXT
-
-feature -- Access
-
- socket_buffer: MANAGED_POINTER
- deferred
- end
-
- read_socket_buffer: MANAGED_POINTER
- do
- Result := socket_buffer
- end
-
- put_socket_buffer: MANAGED_POINTER
- do
- Result := socket_buffer
- end
-
-feature {NONE} -- No-Exception network operation
-
-end
diff --git a/library/network/protocol/content_negotiation/conneg-safe.ecf b/library/network/protocol/content_negotiation/conneg-safe.ecf
index 5d6d4530..f1fbd940 100644
--- a/library/network/protocol/content_negotiation/conneg-safe.ecf
+++ b/library/network/protocol/content_negotiation/conneg-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /CVS$
- /EIFGENs$
-
-
-
-
-
-
-
- /implementation
-
-
-
-
-
+
+
diff --git a/library/network/protocol/content_negotiation/conneg.ecf b/library/network/protocol/content_negotiation/conneg.ecf
index 976cc952..cd6165cf 100644
--- a/library/network/protocol/content_negotiation/conneg.ecf
+++ b/library/network/protocol/content_negotiation/conneg.ecf
@@ -1,18 +1,17 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
+
/implementation
diff --git a/library/network/protocol/content_negotiation/package.iron b/library/network/protocol/content_negotiation/package.iron
index ab6d6d37..11c1066c 100644
--- a/library/network/protocol/content_negotiation/package.iron
+++ b/library/network/protocol/content_negotiation/package.iron
@@ -1,14 +1,14 @@
package content_negotiation
project
- conneg = "conneg-safe.ecf"
conneg = "conneg.ecf"
note
title: CONneg Content Negotiation
description: "[
- CONneg is a library that provides utilities to select the best repesentation of a resource for a client where there are multiple representations available.
- ]"
+CONneg is a library that provides utilities to select the best repesentation of a resource for a client where there are multiple representations available.
+ ]"
+
collection: EWF
tags: content,accept,conneg,negotiation,EWF,web,request
copyright: 2011-2016, Javier Velilla, Jocelyn Fiat, Eiffel Software and others
diff --git a/library/network/protocol/content_negotiation/test/test-safe.ecf b/library/network/protocol/content_negotiation/test/test-safe.ecf
deleted file mode 100644
index 4a9f2d8f..00000000
--- a/library/network/protocol/content_negotiation/test/test-safe.ecf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- /.git$
- /.svn$
- /CVS$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
diff --git a/library/network/protocol/content_negotiation/test/test.ecf b/library/network/protocol/content_negotiation/test/test.ecf
index a1e3c37f..3e78c1a0 100644
--- a/library/network/protocol/content_negotiation/test/test.ecf
+++ b/library/network/protocol/content_negotiation/test/test.ecf
@@ -1,18 +1,25 @@
-
-
+
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
+
+
+
-
+
+
+
diff --git a/library/network/protocol/http/http-safe.ecf b/library/network/protocol/http/http-safe.ecf
index 4cf5101a..7e52f63d 100644
--- a/library/network/protocol/http/http-safe.ecf
+++ b/library/network/protocol/http/http-safe.ecf
@@ -1,21 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
- /tests$
-
-
-
-
+
+
diff --git a/library/network/protocol/http/http.ecf b/library/network/protocol/http/http.ecf
index b3c48093..ca4cdf32 100644
--- a/library/network/protocol/http/http.ecf
+++ b/library/network/protocol/http/http.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/network/protocol/http/package.iron b/library/network/protocol/http/package.iron
index 8e22d41f..2e4bab84 100644
--- a/library/network/protocol/http/package.iron
+++ b/library/network/protocol/http/package.iron
@@ -1,20 +1,20 @@
package http
project
- http = "http-safe.ecf"
http = "http.ecf"
note
title: HTTP protocol
description: "[
- Collection of interfaces related to HTTP protocol:
- - header
- - status codes, request methods
- - content type, media type, mime type.
- - cookie
- - date used in web protocol
- - file extension mime mapping
- ]"
+Collection of interfaces related to HTTP protocol:
+ - header
+ - status codes, request methods
+ - content type, media type, mime type.
+ - cookie
+ - date used in web protocol
+ - file extension mime mapping
+ ]"
+
collection: EWF
tags: http,web,header,status,method,type,mime,cookie
license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
diff --git a/library/network/protocol/http/tests/tests-safe.ecf b/library/network/protocol/http/tests/tests-safe.ecf
deleted file mode 100644
index 7ad1cdd1..00000000
--- a/library/network/protocol/http/tests/tests-safe.ecf
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
diff --git a/library/network/protocol/http/tests/tests.ecf b/library/network/protocol/http/tests/tests.ecf
index 212d1706..4c0ceaec 100644
--- a/library/network/protocol/http/tests/tests.ecf
+++ b/library/network/protocol/http/tests/tests.ecf
@@ -1,17 +1,24 @@
-
-
+
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
+
+
+
-
+
+
+
diff --git a/library/network/websocket/client/example/ws_client/ws_client-safe.ecf b/library/network/websocket/client/example/ws_client/ws_client.ecf
similarity index 60%
rename from library/network/websocket/client/example/ws_client/ws_client-safe.ecf
rename to library/network/websocket/client/example/ws_client/ws_client.ecf
index d46065be..2efdb434 100644
--- a/library/network/websocket/client/example/ws_client/ws_client-safe.ecf
+++ b/library/network/websocket/client/example/ws_client/ws_client.ecf
@@ -1,24 +1,22 @@
-
-
+
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
+
+
-
diff --git a/library/network/websocket/client/web_socket_client-safe.ecf b/library/network/websocket/client/web_socket_client-safe.ecf
index d0cc963e..e6f51f09 100644
--- a/library/network/websocket/client/web_socket_client-safe.ecf
+++ b/library/network/websocket/client/web_socket_client-safe.ecf
@@ -1,43 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /CVS$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
- /no_ssl$
- /spec$
- /ssl$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/network/websocket/client/web_socket_client.ecf b/library/network/websocket/client/web_socket_client.ecf
index 23ebc15e..5a197e17 100644
--- a/library/network/websocket/client/web_socket_client.ecf
+++ b/library/network/websocket/client/web_socket_client.ecf
@@ -1,16 +1,15 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
diff --git a/library/network/websocket/protocol/web_socket_protocol-safe.ecf b/library/network/websocket/protocol/web_socket_protocol-safe.ecf
index 0b08d9a0..65e42fa6 100644
--- a/library/network/websocket/protocol/web_socket_protocol-safe.ecf
+++ b/library/network/websocket/protocol/web_socket_protocol-safe.ecf
@@ -1,9 +1,3 @@
-
-
-
-
-
-
-
-
+
+
diff --git a/library/network/websocket/protocol/web_socket_protocol.ecf b/library/network/websocket/protocol/web_socket_protocol.ecf
index c3d310e4..9b853327 100644
--- a/library/network/websocket/protocol/web_socket_protocol.ecf
+++ b/library/network/websocket/protocol/web_socket_protocol.ecf
@@ -1,10 +1,7 @@
-
+
-
-
diff --git a/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf b/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server.ecf
similarity index 69%
rename from library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf
rename to library/network/websocket/server/example/echo_websocket_server/echo_websocket_server.ecf
index 0567d72c..fb865f91 100644
--- a/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf
+++ b/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server.ecf
@@ -1,27 +1,26 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
+
-
-
-
-
+
+
+
+
@@ -30,14 +29,15 @@
-
+
+
+
-
diff --git a/library/network/websocket/server/websocket_server-safe.ecf b/library/network/websocket/server/websocket_server-safe.ecf
index f2fd971d..610c89cb 100644
--- a/library/network/websocket/server/websocket_server-safe.ecf
+++ b/library/network/websocket/server/websocket_server-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /CVS$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/network/websocket/server/websocket_server.ecf b/library/network/websocket/server/websocket_server.ecf
index 8b5ed2aa..c71e337b 100644
--- a/library/network/websocket/server/websocket_server.ecf
+++ b/library/network/websocket/server/websocket_server.ecf
@@ -1,19 +1,18 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
+
diff --git a/library/runtime/process/notification_email/notification_email-safe.ecf b/library/runtime/process/notification_email/notification_email-safe.ecf
index 46863fca..06189333 100644
--- a/library/runtime/process/notification_email/notification_email-safe.ecf
+++ b/library/runtime/process/notification_email/notification_email-safe.ecf
@@ -1,42 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/runtime/process/notification_email/notification_email.ecf b/library/runtime/process/notification_email/notification_email.ecf
index 5f5937a6..b2ae85e9 100644
--- a/library/runtime/process/notification_email/notification_email.ecf
+++ b/library/runtime/process/notification_email/notification_email.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/runtime/process/notification_email/package.iron b/library/runtime/process/notification_email/package.iron
index 74f0d5f4..17abbb58 100644
--- a/library/runtime/process/notification_email/package.iron
+++ b/library/runtime/process/notification_email/package.iron
@@ -1,25 +1,24 @@
package notification_email
project
- notification_email = "notification_email-safe.ecf"
notification_email = "notification_email.ecf"
note
title: Notification Email
description: "[
- Abstract interface to send message via various mailers:
- - smtp
- - sendmail
- - external script
- - store on local file
- - ...
- ]"
+Abstract interface to send message via various mailers:
+ - smtp
+ - sendmail
+ - external script
+ - store on local file
+ - ...
+ ]"
+
collection: EWF
tags: message,smtp,sendmail,mailer
- copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+ copyright: 2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others
license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
link[license]: http://www.eiffel.com/licensing/forum.txt
link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/runtime/process/notification_email
end
-
diff --git a/library/security/jwt/jwt.ecf b/library/security/jwt/jwt.ecf
index 7a370628..64ea70b9 100644
--- a/library/security/jwt/jwt.ecf
+++ b/library/security/jwt/jwt.ecf
@@ -4,10 +4,6 @@
-
-
-
-
diff --git a/library/security/jwt/package.iron b/library/security/jwt/package.iron
index fd132cd6..3fa82da0 100644
--- a/library/security/jwt/package.iron
+++ b/library/security/jwt/package.iron
@@ -6,7 +6,7 @@ project
note
title: JSON Web Token
description: JSON Web Token
- tags:jwt,web,jws,jwe,token,jose
+ tags: jwt,web,jws,jwe,token,jose
copyright: 2011-2017, Jocelyn Fiat, Eiffel Software and others
license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
link[license]: http://www.eiffel.com/licensing/forum.txt
diff --git a/library/security/openid/consumer/demo/demo-safe.ecf b/library/security/openid/consumer/demo/demo-safe.ecf
index 8eac088d..3220946d 100644
--- a/library/security/openid/consumer/demo/demo-safe.ecf
+++ b/library/security/openid/consumer/demo/demo-safe.ecf
@@ -1,26 +1,3 @@
-
-
-
-
- /.svn$
- /CVS$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/security/openid/consumer/demo/demo.ecf b/library/security/openid/consumer/demo/demo.ecf
new file mode 100644
index 00000000..2c51fa43
--- /dev/null
+++ b/library/security/openid/consumer/demo/demo.ecf
@@ -0,0 +1,27 @@
+
+
+
+
+
+ /\.svn$
+ /CVS$
+ /EIFGENs$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/security/openid/consumer/openid-safe.ecf b/library/security/openid/consumer/openid-safe.ecf
index 8aec8717..d6fc87c8 100644
--- a/library/security/openid/consumer/openid-safe.ecf
+++ b/library/security/openid/consumer/openid-safe.ecf
@@ -1,21 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/security/openid/consumer/openid.ecf b/library/security/openid/consumer/openid.ecf
index cd353d0e..a94a449e 100644
--- a/library/security/openid/consumer/openid.ecf
+++ b/library/security/openid/consumer/openid.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/security/openid/consumer/tests/tests-safe.ecf b/library/security/openid/consumer/tests/tests-safe.ecf
deleted file mode 100644
index b0af2618..00000000
--- a/library/security/openid/consumer/tests/tests-safe.ecf
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
diff --git a/library/security/openid/consumer/tests/tests.ecf b/library/security/openid/consumer/tests/tests.ecf
new file mode 100644
index 00000000..497ab39b
--- /dev/null
+++ b/library/security/openid/consumer/tests/tests.ecf
@@ -0,0 +1,21 @@
+
+
+
+
+
+ /\.git$
+ /\.svn$
+ /EIFGENs$
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/security/openid/package.iron b/library/security/openid/package.iron
index 55db2019..2d11f51f 100644
--- a/library/security/openid/package.iron
+++ b/library/security/openid/package.iron
@@ -2,11 +2,10 @@ package openid
project
openid = "consumer/openid.ecf"
- openid = "consumer/openid-safe.ecf"
note
title: Eiffel OpenID
- description: OpenID consumer library
+ description: OpenID consumer library
tags: openid,security,web,authentication,sso
copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
@@ -15,4 +14,3 @@ note
link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/security/http_authorization/README.md
end
-
diff --git a/library/server/authentication/http_authorization/example/demo_basic_auth.ecf b/library/server/authentication/http_authorization/example/demo_basic_auth.ecf
index dd83dba4..8b427abf 100644
--- a/library/server/authentication/http_authorization/example/demo_basic_auth.ecf
+++ b/library/server/authentication/http_authorization/example/demo_basic_auth.ecf
@@ -1,21 +1,21 @@
-
+
- /.svn$
+ /\.svn$
/CVS$
/EIFGENs$
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/library/server/authentication/http_authorization/http_authorization-safe.ecf b/library/server/authentication/http_authorization/http_authorization-safe.ecf
index 4842c70e..48f5a40e 100644
--- a/library/server/authentication/http_authorization/http_authorization-safe.ecf
+++ b/library/server/authentication/http_authorization/http_authorization-safe.ecf
@@ -1,17 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/authentication/http_authorization/http_authorization.ecf b/library/server/authentication/http_authorization/http_authorization.ecf
index 4e29ed39..3495174d 100644
--- a/library/server/authentication/http_authorization/http_authorization.ecf
+++ b/library/server/authentication/http_authorization/http_authorization.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/authentication/http_authorization/package.iron b/library/server/authentication/http_authorization/package.iron
index 7a597b0b..20a2d47e 100644
--- a/library/server/authentication/http_authorization/package.iron
+++ b/library/server/authentication/http_authorization/package.iron
@@ -1,14 +1,14 @@
package http_authorization
project
- http_authorization = "http_authorization-safe.ecf"
http_authorization = "http_authorization.ecf"
note
title: HTTP Authorization
description: "[
- Class to manipulate HTTP 'Authorization' header value.
- ]"
+Class to manipulate HTTP 'Authorization' header value.
+ ]"
+
collection: EWF
tags: http,authorization,authentication,web
copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
@@ -17,4 +17,3 @@ note
link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/server/authentication/http_authorization
end
-
diff --git a/library/server/authentication/http_authorization/testing/testing-safe.ecf b/library/server/authentication/http_authorization/testing/testing.ecf
similarity index 53%
rename from library/server/authentication/http_authorization/testing/testing-safe.ecf
rename to library/server/authentication/http_authorization/testing/testing.ecf
index 0a5fa8fb..cbd22c73 100644
--- a/library/server/authentication/http_authorization/testing/testing-safe.ecf
+++ b/library/server/authentication/http_authorization/testing/testing.ecf
@@ -1,19 +1,21 @@
-
-
+
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
-
-
-
+
+
+
+
+
+
diff --git a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
index 326f479c..ca144501 100644
--- a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
+++ b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
@@ -1,19 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/ewsgi/connectors/cgi/cgi.ecf b/library/server/ewsgi/connectors/cgi/cgi.ecf
index 449fe8be..331cb277 100644
--- a/library/server/ewsgi/connectors/cgi/cgi.ecf
+++ b/library/server/ewsgi/connectors/cgi/cgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf b/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
index 89e15d79..87ac1628 100644
--- a/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
+++ b/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
@@ -1,20 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf b/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
index 6d18b0ce..6e9c64f3 100644
--- a/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
+++ b/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,12 +7,11 @@
/\.git$
/\.svn$
-
-
-
+
diff --git a/library/server/ewsgi/connectors/nino/nino-safe.ecf b/library/server/ewsgi/connectors/nino/nino-safe.ecf
index 27ca8446..f479519a 100644
--- a/library/server/ewsgi/connectors/nino/nino-safe.ecf
+++ b/library/server/ewsgi/connectors/nino/nino-safe.ecf
@@ -1,22 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/ewsgi/connectors/nino/nino.ecf b/library/server/ewsgi/connectors/nino/nino.ecf
index 39974ba4..f4c0b793 100644
--- a/library/server/ewsgi/connectors/nino/nino.ecf
+++ b/library/server/ewsgi/connectors/nino/nino.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,11 @@
/\.git$
/\.svn$
-
-
+
+
+
diff --git a/library/server/ewsgi/connectors/null/null-safe.ecf b/library/server/ewsgi/connectors/null/null-safe.ecf
index b4473379..697cec65 100644
--- a/library/server/ewsgi/connectors/null/null-safe.ecf
+++ b/library/server/ewsgi/connectors/null/null-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/ewsgi/connectors/null/null.ecf b/library/server/ewsgi/connectors/null/null.ecf
index b5aa764f..64b2c082 100644
--- a/library/server/ewsgi/connectors/null/null.ecf
+++ b/library/server/ewsgi/connectors/null/null.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
index fe2e274d..ac16a883 100644
--- a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/ewsgi/connectors/standalone/standalone.ecf b/library/server/ewsgi/connectors/standalone/standalone.ecf
index fd5e231f..445e9b93 100644
--- a/library/server/ewsgi/connectors/standalone/standalone.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf b/library/server/ewsgi/connectors/standalone/test_standalone.ecf
similarity index 60%
rename from library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf
rename to library/server/ewsgi/connectors/standalone/test_standalone.ecf
index 84dba0fa..f3e50fee 100644
--- a/library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/test_standalone.ecf
@@ -1,23 +1,26 @@
-
+
-
-
-
-
-
+
+
+
+
-
+
+
+
-
+
+
+
diff --git a/library/server/ewsgi/ewsgi-safe.ecf b/library/server/ewsgi/ewsgi-safe.ecf
index c536c87d..2abfda29 100644
--- a/library/server/ewsgi/ewsgi-safe.ecf
+++ b/library/server/ewsgi/ewsgi-safe.ecf
@@ -1,25 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/ewsgi/ewsgi.ecf b/library/server/ewsgi/ewsgi.ecf
index d4e5e408..8e8b162c 100644
--- a/library/server/ewsgi/ewsgi.ecf
+++ b/library/server/ewsgi/ewsgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/ewsgi/ewsgi_spec-safe.ecf b/library/server/ewsgi/ewsgi_spec-safe.ecf
index 4da91d4a..6d38ecf8 100644
--- a/library/server/ewsgi/ewsgi_spec-safe.ecf
+++ b/library/server/ewsgi/ewsgi_spec-safe.ecf
@@ -1,17 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/ewsgi/ewsgi_spec.ecf b/library/server/ewsgi/ewsgi_spec.ecf
index 39f696e0..d5abca8f 100644
--- a/library/server/ewsgi/ewsgi_spec.ecf
+++ b/library/server/ewsgi/ewsgi_spec.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/ewsgi/examples/hello_world/hello-safe.ecf b/library/server/ewsgi/examples/hello_world/hello-safe.ecf
deleted file mode 100644
index 9b1b132e..00000000
--- a/library/server/ewsgi/examples/hello_world/hello-safe.ecf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
diff --git a/library/server/ewsgi/examples/hello_world/hello.ecf b/library/server/ewsgi/examples/hello_world/hello.ecf
index ea014b23..c7975849 100644
--- a/library/server/ewsgi/examples/hello_world/hello.ecf
+++ b/library/server/ewsgi/examples/hello_world/hello.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/ewsgi/package.iron b/library/server/ewsgi/package.iron
index 504ddcc3..a20fb463 100644
--- a/library/server/ewsgi/package.iron
+++ b/library/server/ewsgi/package.iron
@@ -1,24 +1,20 @@
package ewsgi
project
- ewsgi = "ewsgi-safe.ecf"
ewsgi = "ewsgi.ecf"
- connector_cgi = "connectors/cgi/cgi-safe.ecf"
connector_cgi = "connectors/cgi/cgi.ecf"
- connector_libfcgi = "connectors/libfcgi/libfcgi-safe.ecf"
connector_libfcgi = "connectors/libfcgi/libfcgi.ecf"
- connector_null = "connectors/null/null-safe.ecf"
connector_null = "connectors/null/null.ecf"
- connector_standalone = "connectors/standalone/standalone-safe.ecf"
connector_standalone = "connectors/standalone/standalone.ecf"
- httpd = "connectors/standalone/src/httpd/httpd-safe.ecf"
- httpd = "connectors/standalone/src/httpd/httpd.ecf"
+ ewsgi_spec = "ewsgi_spec.ecf"
+ connector_nino = "connectors/nino/nino.ecf"
note
title: EWSGI
description: "[
- Eiffel Web Server Gateway Interface (EWSGI) specification, and a few connectors.
- ]"
+Eiffel Web Server Gateway Interface (EWSGI) specification, and a few connectors.
+ ]"
+
collection: EWF
tags: ewsgi,cgi,web,httpd,ewf
copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
@@ -26,5 +22,5 @@ note
link[license]: http://www.eiffel.com/licensing/forum.txt
link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/server/ewsgi
link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/server/ewsgi/doc
-end
+end
diff --git a/library/server/httpd/configuration/httpd_configuration_i.e b/library/server/httpd/configuration/httpd_configuration_i.e
index f02c35e6..4d7054b9 100644
--- a/library/server/httpd/configuration/httpd_configuration_i.e
+++ b/library/server/httpd/configuration/httpd_configuration_i.e
@@ -297,16 +297,17 @@ feature -- Element change
set_secure_protocol_from_string (a_ssl_version: READABLE_STRING_GENERAL)
-- Set `secure_protocol' with `a_ssl_version'.
do
- if a_ssl_version.is_case_insensitive_equal ("ssl_2_3") then
- set_secure_protocol_to_ssl_2_or_3
- elseif a_ssl_version.is_case_insensitive_equal ("tls_1_0") then
- set_secure_protocol_to_tls_1_0
+ if a_ssl_version.is_case_insensitive_equal ("tls_1_2") then
+ set_secure_protocol_to_tls_1_2
elseif a_ssl_version.is_case_insensitive_equal ("tls_1_1") then
set_secure_protocol_to_tls_1_1
- elseif a_ssl_version.is_case_insensitive_equal ("tls_1_2") then
- set_secure_protocol_to_tls_1_2
+ elseif a_ssl_version.is_case_insensitive_equal ("tls_1_0") then
+ set_secure_protocol_to_tls_1_0
elseif a_ssl_version.is_case_insensitive_equal ("dtls_1_0") then
set_secure_protocol_to_dtls_1_0
+ elseif a_ssl_version.is_case_insensitive_equal ("ssl_2_3") then
+ -- Obsolete!
+ set_secure_protocol_to_ssl_2_or_3
else -- Default
set_secure_protocol_to_tls_1_2
end
@@ -317,7 +318,7 @@ feature -- SSL Helpers
set_secure_protocol_to_ssl_2_or_3
-- Set `secure_protocol' with `Ssl_23'.
obsolete
- "Use set_secure_protocol_to_tls_1_2 [2017-06-23]."
+ "Use `set_secure_protocol_to_tls_1_2` [2017-06-23]."
deferred
end
diff --git a/library/server/httpd/httpd-safe.ecf b/library/server/httpd/httpd-safe.ecf
index 0c70796f..eb953c50 100644
--- a/library/server/httpd/httpd-safe.ecf
+++ b/library/server/httpd/httpd-safe.ecf
@@ -1,70 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /concurrency$
- /no_ssl$
- /ssl$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/httpd/httpd.ecf b/library/server/httpd/httpd.ecf
index d4012fd7..9f10b47d 100644
--- a/library/server/httpd/httpd.ecf
+++ b/library/server/httpd/httpd.ecf
@@ -1,15 +1,12 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
@@ -17,8 +14,11 @@
+
+
-
+
+
@@ -36,16 +36,12 @@
-
-
-
-
@@ -64,4 +60,7 @@
+
+
+
diff --git a/library/server/httpd/package.iron b/library/server/httpd/package.iron
index bb34ce9f..66a6fc00 100644
--- a/library/server/httpd/package.iron
+++ b/library/server/httpd/package.iron
@@ -1,14 +1,14 @@
package httpd
project
- httpd = "httpd-safe.ecf"
httpd = "httpd.ecf"
note
title: HTTP server
description: "[
- Simple HTTP listener and handler, that can be extended easily.
- ]"
+Simple HTTP listener and handler, that can be extended easily.
+ ]"
+
tags: http,httpd,server,web
collection: EWF
copyright: 2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others
diff --git a/library/server/libfcgi/libfcgi-safe.ecf b/library/server/libfcgi/libfcgi-safe.ecf
index c94eb0ee..fc19a31b 100644
--- a/library/server/libfcgi/libfcgi-safe.ecf
+++ b/library/server/libfcgi/libfcgi-safe.ecf
@@ -1,67 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /fake$
- /linux$
- /mac$
-
-
-
-
-
- /fake$
- /mac$
- /windows$
-
-
-
-
-
- /fake$
- /linux$
- /windows$
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/libfcgi/libfcgi.ecf b/library/server/libfcgi/libfcgi.ecf
index 8131c309..120167c6 100644
--- a/library/server/libfcgi/libfcgi.ecf
+++ b/library/server/libfcgi/libfcgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/libfcgi/package.iron b/library/server/libfcgi/package.iron
index d60015d3..6c6f0ec9 100644
--- a/library/server/libfcgi/package.iron
+++ b/library/server/libfcgi/package.iron
@@ -4,16 +4,16 @@ setup
compile_library = Clib
project
- libfcgi = "libfcgi-safe.ecf"
libfcgi = "libfcgi.ecf"
note
title: Eiffel libfcgi wrapper
description: "[
- Wrapper on modified libfcgi.
- (modification: added 64 bits support)
- It brings implementation for FCGI protocol.
- ]"
+Wrapper on modified libfcgi.
+(modification: added 64 bits support)
+It brings implementation for FCGI protocol.
+ ]"
+
collection: EWF
tags: fcgi,libfcgi,cgi,http,web,ewf
copyright: 2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others
diff --git a/library/server/libfcgi/tests/eiffelweb-safe.ecf b/library/server/libfcgi/tests/eiffelweb-safe.ecf
deleted file mode 100644
index 16a5f343..00000000
--- a/library/server/libfcgi/tests/eiffelweb-safe.ecf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
diff --git a/library/server/libfcgi/tests/eiffelweb.ecf b/library/server/libfcgi/tests/eiffelweb.ecf
index f7157475..d9ca400f 100644
--- a/library/server/libfcgi/tests/eiffelweb.ecf
+++ b/library/server/libfcgi/tests/eiffelweb.ecf
@@ -1,16 +1,16 @@
-
-
+
+
/EIFGENs$
/\.git$
/\.svn$
-
-
+
+
+
diff --git a/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi-safe.ecf b/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
index d59d3d4e..fcb6d042 100644
--- a/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
+++ b/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
@@ -1,24 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
- /wgi_.*_connector.e$
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi.ecf b/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi.ecf
index 43238190..59057676 100644
--- a/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi.ecf
+++ b/library/server/obsolete/v0/ewsgi/connectors/libfcgi/libfcgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,18 +7,15 @@
/\.git$
/\.svn$
-
-
- /.*_service.e$
/wgi_.*_connector.e$
- /wgi_.*_handler.e$
diff --git a/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf b/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf
index 3ce5811e..d90cfb1f 100644
--- a/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf
+++ b/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf
@@ -1,29 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
- /.*_service.e$
- /wgi_.*_connector.e$
- /wgi_.*_handler.e$
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf b/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf
index 1011a571..95bdc684 100644
--- a/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf
+++ b/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,11 @@
/\.git$
/\.svn$
-
-
+
+
+
diff --git a/library/server/obsolete/v0/ewsgi/ewsgi-safe.ecf b/library/server/obsolete/v0/ewsgi/ewsgi-safe.ecf
index 3a904bbc..cdf418b2 100644
--- a/library/server/obsolete/v0/ewsgi/ewsgi-safe.ecf
+++ b/library/server/obsolete/v0/ewsgi/ewsgi-safe.ecf
@@ -1,27 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/ewsgi/ewsgi.ecf b/library/server/obsolete/v0/ewsgi/ewsgi.ecf
index 4e0c04f4..315ad1f8 100644
--- a/library/server/obsolete/v0/ewsgi/ewsgi.ecf
+++ b/library/server/obsolete/v0/ewsgi/ewsgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/obsolete/v0/wsf/connector/libfcgi-safe.ecf b/library/server/obsolete/v0/wsf/connector/libfcgi-safe.ecf
index ed09ba53..2eab6b8b 100644
--- a/library/server/obsolete/v0/wsf/connector/libfcgi-safe.ecf
+++ b/library/server/obsolete/v0/wsf/connector/libfcgi-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/connector/libfcgi.ecf b/library/server/obsolete/v0/wsf/connector/libfcgi.ecf
index 8202c47a..3db51d3f 100644
--- a/library/server/obsolete/v0/wsf/connector/libfcgi.ecf
+++ b/library/server/obsolete/v0/wsf/connector/libfcgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/obsolete/v0/wsf/connector/nino-safe.ecf b/library/server/obsolete/v0/wsf/connector/nino-safe.ecf
index b3d46573..e2e1a2f6 100644
--- a/library/server/obsolete/v0/wsf/connector/nino-safe.ecf
+++ b/library/server/obsolete/v0/wsf/connector/nino-safe.ecf
@@ -1,26 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/connector/nino.ecf b/library/server/obsolete/v0/wsf/connector/nino.ecf
index ba0da66e..984d312d 100644
--- a/library/server/obsolete/v0/wsf/connector/nino.ecf
+++ b/library/server/obsolete/v0/wsf/connector/nino.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,11 @@
/\.git$
/\.svn$
-
-
+
+
+
diff --git a/library/server/obsolete/v0/wsf/default/libfcgi-safe.ecf b/library/server/obsolete/v0/wsf/default/libfcgi-safe.ecf
index cebdfea7..5a38a136 100644
--- a/library/server/obsolete/v0/wsf/default/libfcgi-safe.ecf
+++ b/library/server/obsolete/v0/wsf/default/libfcgi-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/default/libfcgi.ecf b/library/server/obsolete/v0/wsf/default/libfcgi.ecf
index da05ddba..7a18364b 100644
--- a/library/server/obsolete/v0/wsf/default/libfcgi.ecf
+++ b/library/server/obsolete/v0/wsf/default/libfcgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/obsolete/v0/wsf/default/nino-safe.ecf b/library/server/obsolete/v0/wsf/default/nino-safe.ecf
index 4937ce34..33066aeb 100644
--- a/library/server/obsolete/v0/wsf/default/nino-safe.ecf
+++ b/library/server/obsolete/v0/wsf/default/nino-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/default/nino.ecf b/library/server/obsolete/v0/wsf/default/nino.ecf
index ce4bb3e8..553a55cc 100644
--- a/library/server/obsolete/v0/wsf/default/nino.ecf
+++ b/library/server/obsolete/v0/wsf/default/nino.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,11 @@
/\.git$
/\.svn$
-
-
+
+
+
diff --git a/library/server/obsolete/v0/wsf/wsf-safe.ecf b/library/server/obsolete/v0/wsf/wsf-safe.ecf
index 10a2f70d..973557d5 100644
--- a/library/server/obsolete/v0/wsf/wsf-safe.ecf
+++ b/library/server/obsolete/v0/wsf/wsf-safe.ecf
@@ -1,38 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /policy_driven$
-
-
-
-
-
- /service$
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/wsf.ecf b/library/server/obsolete/v0/wsf/wsf.ecf
index 624f3894..c355b705 100644
--- a/library/server/obsolete/v0/wsf/wsf.ecf
+++ b/library/server/obsolete/v0/wsf/wsf.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/obsolete/v0/wsf/wsf_extension-safe.ecf b/library/server/obsolete/v0/wsf/wsf_extension-safe.ecf
index a1713f43..97afc7e4 100644
--- a/library/server/obsolete/v0/wsf/wsf_extension-safe.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_extension-safe.ecf
@@ -1,21 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/wsf_extension.ecf b/library/server/obsolete/v0/wsf/wsf_extension.ecf
index 3fca1079..5a3ff809 100644
--- a/library/server/obsolete/v0/wsf/wsf_extension.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_extension.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/obsolete/v0/wsf/wsf_policy_driven-safe.ecf b/library/server/obsolete/v0/wsf/wsf_policy_driven-safe.ecf
index 84572b66..a9a6152f 100644
--- a/library/server/obsolete/v0/wsf/wsf_policy_driven-safe.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_policy_driven-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/wsf_policy_driven.ecf b/library/server/obsolete/v0/wsf/wsf_policy_driven.ecf
index 193a8db4..b7069cc6 100644
--- a/library/server/obsolete/v0/wsf/wsf_policy_driven.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_policy_driven.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/obsolete/v0/wsf/wsf_router_context-safe.ecf b/library/server/obsolete/v0/wsf/wsf_router_context-safe.ecf
index 9e53cd39..9b69e5a4 100644
--- a/library/server/obsolete/v0/wsf/wsf_router_context-safe.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_router_context-safe.ecf
@@ -1,17 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/wsf_router_context.ecf b/library/server/obsolete/v0/wsf/wsf_router_context.ecf
index 20cbe3f5..ad61c78c 100644
--- a/library/server/obsolete/v0/wsf/wsf_router_context.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_router_context.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/obsolete/v0/wsf/wsf_session-safe.ecf b/library/server/obsolete/v0/wsf/wsf_session-safe.ecf
index aa1b786b..124e8c6e 100644
--- a/library/server/obsolete/v0/wsf/wsf_session-safe.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_session-safe.ecf
@@ -1,21 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf/wsf_session.ecf b/library/server/obsolete/v0/wsf/wsf_session.ecf
index 4ed7951c..d4a0b365 100644
--- a/library/server/obsolete/v0/wsf/wsf_session.ecf
+++ b/library/server/obsolete/v0/wsf/wsf_session.ecf
@@ -1,21 +1,20 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
-
+
diff --git a/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf b/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf
index 8e8e2d21..06fb588c 100644
--- a/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf
+++ b/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf
@@ -1,22 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/obsolete/v0/wsf_html/wsf_html.ecf b/library/server/obsolete/v0/wsf_html/wsf_html.ecf
index 1677881f..5e0084a4 100644
--- a/library/server/obsolete/v0/wsf_html/wsf_html.ecf
+++ b/library/server/obsolete/v0/wsf_html/wsf_html.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/wsf/connector/all-safe.ecf b/library/server/wsf/connector/all-safe.ecf
index 8d3c51d0..c091dccd 100644
--- a/library/server/wsf/connector/all-safe.ecf
+++ b/library/server/wsf/connector/all-safe.ecf
@@ -1,27 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/connector/all.ecf b/library/server/wsf/connector/all.ecf
index 1381465f..1647840d 100644
--- a/library/server/wsf/connector/all.ecf
+++ b/library/server/wsf/connector/all.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/connector/cgi-safe.ecf b/library/server/wsf/connector/cgi-safe.ecf
index 9901295c..ea34f4b1 100644
--- a/library/server/wsf/connector/cgi-safe.ecf
+++ b/library/server/wsf/connector/cgi-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/connector/cgi.ecf b/library/server/wsf/connector/cgi.ecf
index 40566927..f13e5c75 100644
--- a/library/server/wsf/connector/cgi.ecf
+++ b/library/server/wsf/connector/cgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/connector/libfcgi-safe.ecf b/library/server/wsf/connector/libfcgi-safe.ecf
index 61eee5f3..e8b51ae9 100644
--- a/library/server/wsf/connector/libfcgi-safe.ecf
+++ b/library/server/wsf/connector/libfcgi-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/connector/libfcgi.ecf b/library/server/wsf/connector/libfcgi.ecf
index 2e4e9474..10e089d0 100644
--- a/library/server/wsf/connector/libfcgi.ecf
+++ b/library/server/wsf/connector/libfcgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/connector/nino-safe.ecf b/library/server/wsf/connector/nino-safe.ecf
index f58aa75e..dc8c98ba 100644
--- a/library/server/wsf/connector/nino-safe.ecf
+++ b/library/server/wsf/connector/nino-safe.ecf
@@ -1,26 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/connector/nino.ecf b/library/server/wsf/connector/nino.ecf
index c50711f2..1c6ad71e 100644
--- a/library/server/wsf/connector/nino.ecf
+++ b/library/server/wsf/connector/nino.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,11 @@
/\.git$
/\.svn$
-
-
+
+
+
diff --git a/library/server/wsf/connector/openshift-safe.ecf b/library/server/wsf/connector/openshift-safe.ecf
index cbcfd5cf..8ba051fc 100644
--- a/library/server/wsf/connector/openshift-safe.ecf
+++ b/library/server/wsf/connector/openshift-safe.ecf
@@ -1,19 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/connector/openshift.ecf b/library/server/wsf/connector/openshift.ecf
index 371275e3..9b7ce580 100644
--- a/library/server/wsf/connector/openshift.ecf
+++ b/library/server/wsf/connector/openshift.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/connector/standalone-safe.ecf b/library/server/wsf/connector/standalone-safe.ecf
index 6b884d46..cbc4f7f3 100644
--- a/library/server/wsf/connector/standalone-safe.ecf
+++ b/library/server/wsf/connector/standalone-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/connector/standalone.ecf b/library/server/wsf/connector/standalone.ecf
index c91e3b9a..2911e111 100644
--- a/library/server/wsf/connector/standalone.ecf
+++ b/library/server/wsf/connector/standalone.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,17 +7,16 @@
/\.git$
/\.svn$
-
-
-
+
-
+
-
+
diff --git a/library/server/wsf/connector/standalone_websocket-safe.ecf b/library/server/wsf/connector/standalone_websocket-safe.ecf
index e5d56d4d..b4d16f11 100644
--- a/library/server/wsf/connector/standalone_websocket-safe.ecf
+++ b/library/server/wsf/connector/standalone_websocket-safe.ecf
@@ -1,27 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/connector/standalone_websocket.ecf b/library/server/wsf/connector/standalone_websocket.ecf
index 1f8e054b..0c100d23 100644
--- a/library/server/wsf/connector/standalone_websocket.ecf
+++ b/library/server/wsf/connector/standalone_websocket.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/default/cgi-safe.ecf b/library/server/wsf/default/cgi-safe.ecf
index bcc72eb5..1f48606e 100644
--- a/library/server/wsf/default/cgi-safe.ecf
+++ b/library/server/wsf/default/cgi-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/default/cgi.ecf b/library/server/wsf/default/cgi.ecf
index 7105b945..5ec4d21c 100644
--- a/library/server/wsf/default/cgi.ecf
+++ b/library/server/wsf/default/cgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/default/libfcgi-safe.ecf b/library/server/wsf/default/libfcgi-safe.ecf
index 3cd633cc..1d8e00ed 100644
--- a/library/server/wsf/default/libfcgi-safe.ecf
+++ b/library/server/wsf/default/libfcgi-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/default/libfcgi.ecf b/library/server/wsf/default/libfcgi.ecf
index d17bdb43..b03d051f 100644
--- a/library/server/wsf/default/libfcgi.ecf
+++ b/library/server/wsf/default/libfcgi.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/default/nino-safe.ecf b/library/server/wsf/default/nino-safe.ecf
index 08138562..8a9c3119 100644
--- a/library/server/wsf/default/nino-safe.ecf
+++ b/library/server/wsf/default/nino-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/default/nino.ecf b/library/server/wsf/default/nino.ecf
index f5ced01e..f9e891ea 100644
--- a/library/server/wsf/default/nino.ecf
+++ b/library/server/wsf/default/nino.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,11 @@
/\.git$
/\.svn$
-
-
+
+
+
diff --git a/library/server/wsf/default/openshift-safe.ecf b/library/server/wsf/default/openshift-safe.ecf
index 566a353f..b8dd8023 100644
--- a/library/server/wsf/default/openshift-safe.ecf
+++ b/library/server/wsf/default/openshift-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/default/openshift.ecf b/library/server/wsf/default/openshift.ecf
index bb1624ed..ca75cc8f 100644
--- a/library/server/wsf/default/openshift.ecf
+++ b/library/server/wsf/default/openshift.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,8 @@
/\.git$
/\.svn$
-
-
diff --git a/library/server/wsf/default/standalone-safe.ecf b/library/server/wsf/default/standalone-safe.ecf
index 31c70da1..d3ae971f 100644
--- a/library/server/wsf/default/standalone-safe.ecf
+++ b/library/server/wsf/default/standalone-safe.ecf
@@ -1,18 +1,3 @@
-
-
-
-
- /EIFGENs$
- /\.git$
- /\.svn$
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/default/standalone.ecf b/library/server/wsf/default/standalone.ecf
index 84285953..28f22cf8 100644
--- a/library/server/wsf/default/standalone.ecf
+++ b/library/server/wsf/default/standalone.ecf
@@ -1,5 +1,5 @@
-
+
@@ -7,11 +7,10 @@
/\.git$
/\.svn$
-
-
-
+
diff --git a/library/server/wsf/package.iron b/library/server/wsf/package.iron
index f766b25f..702947af 100644
--- a/library/server/wsf/package.iron
+++ b/library/server/wsf/package.iron
@@ -1,40 +1,32 @@
-
package wsf
project
- wsf = "wsf-safe.ecf"
wsf = "wsf.ecf"
- wsf_extension = "wsf_extension-safe.ecf"
wsf_extension = "wsf_extension.ecf"
- wsf_policy_driven = "wsf_policy_driven-safe.ecf"
wsf_policy_driven = "wsf_policy_driven.ecf"
- wsf_router_context = "wsf_router_context-safe.ecf"
wsf_router_context = "wsf_router_context.ecf"
- wsf_session = "wsf_session-safe.ecf"
wsf_session = "wsf_session.ecf"
- wsf_cgi = "connector/cgi-safe.ecf"
wsf_cgi = "connector/cgi.ecf"
- wsf_libfcgi = "connector/libfcgi-safe.ecf"
wsf_libfcgi = "connector/libfcgi.ecf"
- wsf_openshift = "connector/openshift-safe.ecf"
- default_cgi = "default/cgi-safe.ecf"
default_cgi = "default/cgi.ecf"
- default_libfcgi = "default/libfcgi-safe.ecf"
default_libfcgi = "default/libfcgi.ecf"
- default_openshift = "default/openshift-safe.ecf"
- wsf_standalone = "connector/standalone-safe.ecf"
+ default_openshift = "default/openshift.ecf"
wsf_standalone = "connector/standalone.ecf"
- default_standalone = "default/standalone-safe.ecf"
default_standalone = "default/standalone.ecf"
-
+ wsf_all = "connector/all.ecf"
+ wsf_nino = "connector/nino.ecf"
+ wsf_openshift = "connector/openshift.ecf"
+ wsf_standalone_websocket = "connector/standalone_websocket.ecf"
+ default_nino = "default/nino.ecf"
note
title: Web Server Foundation
description: "[
- Core of the Eiffel Web Framework (EWF).
- Provide the request, response, router, ... interfaces.
- The foundation to build web server application.
- ]"
+Core of the Eiffel Web Framework (EWF).
+Provide the request, response, router, ... interfaces.
+The foundation to build web server application.
+ ]"
+
tags: ewf,server,httpd,request,connector,web
collection: EWF
copyright: 2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others
@@ -44,4 +36,3 @@ note
link[doc]: "Documentation" http://eiffelwebframework.github.io/EWF/
end
-
diff --git a/library/server/wsf/tests/echo/echo-safe.ecf b/library/server/wsf/tests/echo/echo-safe.ecf
deleted file mode 100644
index 9146db93..00000000
--- a/library/server/wsf/tests/echo/echo-safe.ecf
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/library/server/wsf/tests/echo/echo.ecf b/library/server/wsf/tests/echo/echo.ecf
new file mode 100644
index 00000000..b7801895
--- /dev/null
+++ b/library/server/wsf/tests/echo/echo.ecf
@@ -0,0 +1,20 @@
+
+
+
+
+
+ /\.git$
+ /\.svn$
+ /EIFGENs$
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/server/wsf/tests/tests-safe.ecf b/library/server/wsf/tests/tests-safe.ecf
deleted file mode 100644
index ee1252ee..00000000
--- a/library/server/wsf/tests/tests-safe.ecf
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/library/server/wsf/tests/tests.ecf b/library/server/wsf/tests/tests.ecf
index dc13d593..0f2564c8 100644
--- a/library/server/wsf/tests/tests.ecf
+++ b/library/server/wsf/tests/tests.ecf
@@ -1,25 +1,32 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
-
+
+
+
-
-
-
+
+
+
+
diff --git a/library/server/wsf/wsf-safe.ecf b/library/server/wsf/wsf-safe.ecf
index 58e2b2ba..711dab71 100644
--- a/library/server/wsf/wsf-safe.ecf
+++ b/library/server/wsf/wsf-safe.ecf
@@ -1,32 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /policy_driven$
-
-
-
-
-
+
+
diff --git a/library/server/wsf/wsf.ecf b/library/server/wsf/wsf.ecf
index 58b50f1b..231927ad 100644
--- a/library/server/wsf/wsf.ecf
+++ b/library/server/wsf/wsf.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/wsf/wsf_extension-safe.ecf b/library/server/wsf/wsf_extension-safe.ecf
index f7e5884e..2355bb81 100644
--- a/library/server/wsf/wsf_extension-safe.ecf
+++ b/library/server/wsf/wsf_extension-safe.ecf
@@ -1,21 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/wsf_extension.ecf b/library/server/wsf/wsf_extension.ecf
index 373a3633..ddc5a1dc 100644
--- a/library/server/wsf/wsf_extension.ecf
+++ b/library/server/wsf/wsf_extension.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/wsf/wsf_policy_driven-safe.ecf b/library/server/wsf/wsf_policy_driven-safe.ecf
index 94858f09..463bf231 100644
--- a/library/server/wsf/wsf_policy_driven-safe.ecf
+++ b/library/server/wsf/wsf_policy_driven-safe.ecf
@@ -1,23 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/wsf_policy_driven.ecf b/library/server/wsf/wsf_policy_driven.ecf
index b7fc8486..6f497e64 100644
--- a/library/server/wsf/wsf_policy_driven.ecf
+++ b/library/server/wsf/wsf_policy_driven.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/wsf/wsf_router_context-safe.ecf b/library/server/wsf/wsf_router_context-safe.ecf
index 729ad6d4..9256a9da 100644
--- a/library/server/wsf/wsf_router_context-safe.ecf
+++ b/library/server/wsf/wsf_router_context-safe.ecf
@@ -1,17 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/wsf_router_context.ecf b/library/server/wsf/wsf_router_context.ecf
index 7d03a0d2..fad284c7 100644
--- a/library/server/wsf/wsf_router_context.ecf
+++ b/library/server/wsf/wsf_router_context.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/wsf/wsf_session-safe.ecf b/library/server/wsf/wsf_session-safe.ecf
index b2d5d9c9..124e8c6e 100644
--- a/library/server/wsf/wsf_session-safe.ecf
+++ b/library/server/wsf/wsf_session-safe.ecf
@@ -1,21 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf/wsf_session.ecf b/library/server/wsf/wsf_session.ecf
index 860caff5..d920e934 100644
--- a/library/server/wsf/wsf_session.ecf
+++ b/library/server/wsf/wsf_session.ecf
@@ -1,21 +1,20 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
-
+
diff --git a/library/server/wsf_html/form/field/wsf_form_textarea.e b/library/server/wsf_html/form/field/wsf_form_textarea.e
index 78073a11..fda39679 100644
--- a/library/server/wsf_html/form/field/wsf_form_textarea.e
+++ b/library/server/wsf_html/form/field/wsf_form_textarea.e
@@ -22,7 +22,7 @@ feature {NONE} -- Initialization
feature -- Access
- default_value: detachable READABLE_STRING_GENERAL
+ default_value: detachable READABLE_STRING_32
rows: INTEGER
@@ -54,9 +54,13 @@ feature -- Element change
end
end
- set_default_value (v: like default_value)
+ set_default_value (v: detachable READABLE_STRING_GENERAL)
do
- default_value := v
+ if v = Void then
+ default_value := Void
+ else
+ default_value := v.as_string_32
+ end
end
feature -- Conversion
diff --git a/library/server/wsf_html/form/wsf_form_composite.e b/library/server/wsf_html/form/wsf_form_composite.e
index b3b9ca4b..1df452d4 100644
--- a/library/server/wsf_html/form/wsf_form_composite.e
+++ b/library/server/wsf_html/form/wsf_form_composite.e
@@ -1,8 +1,7 @@
note
- description : "Objects that ..."
- author : "$Author$"
- date : "$Date$"
- revision : "$Revision$"
+ description : "Objects containing widget WSF_WIDGET objects, and add specific form support (notion of form fields)."
+ date: "$Date$"
+ revision: "$Revision$"
deferred class
WSF_FORM_COMPOSITE
diff --git a/library/server/wsf_html/form/wsf_form_data.e b/library/server/wsf_html/form/wsf_form_data.e
index dce571af..644e2f0a 100644
--- a/library/server/wsf_html/form/wsf_form_data.e
+++ b/library/server/wsf_html/form/wsf_form_data.e
@@ -48,7 +48,9 @@ feature -- Access
item (a_name: READABLE_STRING_GENERAL): detachable WSF_VALUE
do
- Result := items.item (a_name.as_string_8)
+ if a_name.is_valid_as_string_8 then
+ Result := items.item (a_name.to_string_8)
+ end
end
string_item (a_name: READABLE_STRING_GENERAL): detachable READABLE_STRING_32
diff --git a/library/server/wsf_html/form/wsf_form_field_with_numeric_attribute.e b/library/server/wsf_html/form/wsf_form_field_with_numeric_attribute.e
index 7745ce06..7226f861 100644
--- a/library/server/wsf_html/form/wsf_form_field_with_numeric_attribute.e
+++ b/library/server/wsf_html/form/wsf_form_field_with_numeric_attribute.e
@@ -39,7 +39,7 @@ feature -- Element Change
set_max (a_val: INTEGER)
-- Set `max' with `a_val'.
do
- set_max_string(a_val.out)
+ set_max_string (a_val.out)
ensure
max_set: attached max as l_max implies l_max.same_string (a_val.out)
end
@@ -94,7 +94,6 @@ feature -- Element Change
step_set: attached step as l_step implies l_step.same_string_general (a_val)
end
-
feature {NONE} -- Conversion
append_numeric_input_attributes_to (a_target: STRING)
@@ -103,7 +102,7 @@ feature {NONE} -- Conversion
--min
if attached min as l_min then
a_target.append (" min=%"")
- a_target.append(l_min)
+ a_target.append (l_min)
a_target.append_character ('%"')
end
diff --git a/library/server/wsf_html/form/wsf_form_input.e b/library/server/wsf_html/form/wsf_form_input.e
index 035c7410..d8e5434e 100644
--- a/library/server/wsf_html/form/wsf_form_input.e
+++ b/library/server/wsf_html/form/wsf_form_input.e
@@ -19,7 +19,7 @@ feature {NONE} -- Initialization
name := a_name
end
- make_with_text (a_name: like name; a_text: READABLE_STRING_32)
+ make_with_text (a_name: like name; a_text: READABLE_STRING_GENERAL)
do
make (a_name)
set_text_value (a_text)
@@ -44,7 +44,7 @@ feature -- Access
feature -- Element change
- set_text_value (s: detachable READABLE_STRING_32)
+ set_text_value (s: detachable READABLE_STRING_GENERAL)
do
set_default_value (s)
end
@@ -73,9 +73,13 @@ feature -- Element change
end
end
- set_default_value (v: like default_value)
+ set_default_value (v: detachable READABLE_STRING_GENERAL)
do
- default_value := v
+ if v = Void then
+ default_value := Void
+ else
+ default_value := v.as_string_32
+ end
end
feature -- Conversion
diff --git a/library/server/wsf_html/form/wsf_form_input_with_html5.e b/library/server/wsf_html/form/wsf_form_input_with_html5.e
index 604b2086..97b8f521 100644
--- a/library/server/wsf_html/form/wsf_form_input_with_html5.e
+++ b/library/server/wsf_html/form/wsf_form_input_with_html5.e
@@ -35,12 +35,17 @@ feature -- Access
feature -- Change element
- set_placeholder (a_placeholder: READABLE_STRING_32)
+ set_placeholder (a_placeholder: detachable READABLE_STRING_GENERAL)
-- Set `placeholder' with `a_placeholder'.
do
- placeholder := a_placeholder
+ if a_placeholder = Void then
+ placeholder := Void
+ else
+ placeholder := a_placeholder.as_string_32
+ end
ensure
- placeholder_set: attached placeholder as l_placeholder implies l_placeholder = a_placeholder
+ placeholder_set: (a_placeholder = Void implies placeholder = Void)
+ or (a_placeholder /= Void implies (attached placeholder as l_placeholder and then a_placeholder.same_string (l_placeholder)))
end
enable_autofocus
@@ -91,16 +96,21 @@ feature -- Change element
required_flase: not required
end
- set_pattern (a_pattern: READABLE_STRING_32)
+ set_pattern (a_pattern: READABLE_STRING_GENERAL)
-- Set `pattern' with `a_pattern'.
-- Example:[0-9][A-Z]{3}
-- Check HTML5 patterns site.
note
EIS: "name=HTML5 Patterns", "src=http://html5pattern.com/"
do
- pattern := a_pattern
+ if a_pattern = Void then
+ pattern := Void
+ else
+ pattern := a_pattern.as_string_32
+ end
ensure
- pattern_set: attached pattern as l_pattern implies l_pattern = a_pattern
+ pattern_set: (a_pattern = Void implies pattern = Void) or
+ a_pattern /= Void implies attached pattern as l_pattern and then a_pattern.same_string (l_pattern)
end
diff --git a/library/server/wsf_html/form/wsf_form_with_alternative_actions.e b/library/server/wsf_html/form/wsf_form_with_alternative_actions.e
index e43f9d7d..eb65c07c 100644
--- a/library/server/wsf_html/form/wsf_form_with_alternative_actions.e
+++ b/library/server/wsf_html/form/wsf_form_with_alternative_actions.e
@@ -43,7 +43,6 @@ feature -- Access
feature -- Element Change
-
set_formnovalidate
-- Set formnovalidate to True.
do
@@ -60,49 +59,69 @@ feature -- Element Change
formnovalidate_false: not formnovalidate
end
- set_formaction (a_action: READABLE_STRING_GENERAL)
+ set_formaction (a_action: detachable READABLE_STRING_GENERAL)
-- Set `formaction' with `a_action'.
-- Example:
require
- is_valid_as_string_8: a_action.is_valid_as_string_8
+ is_valid_as_string_8: a_action /= Void implies a_action.is_valid_as_string_8
do
- formaction := a_action.to_string_8
+ if a_action = Void then
+ formaction := Void
+ else
+ formaction := a_action.to_string_8
+ end
ensure
- formaction_set: attached formaction as l_action implies l_action = a_action
+ formaction_set: (a_action = Void implies formaction = Void)
+ or (a_action /= Void implies (attached formaction as l_action and then a_action.same_string (l_action)))
end
- set_formenctype (a_enctype: READABLE_STRING_GENERAL)
+ set_formenctype (a_enctype: detachable READABLE_STRING_GENERAL)
-- Set `formenctype' with `a_enctype'.
-- Example:
require
- is_valid_as_string_8: a_enctype.is_valid_as_string_8
+ is_valid_as_string_8: a_enctype /= Void implies a_enctype.is_valid_as_string_8
do
- formenctype := a_enctype.to_string_8
+ if a_enctype = Void then
+ formenctype := Void
+ else
+ formenctype := a_enctype.to_string_8
+ end
ensure
- formenctype_set: attached formenctype as l_enctype implies l_enctype = a_enctype
+ formenctype_set: (a_enctype = Void implies formenctype = Void)
+ or (a_enctype /= Void implies (attached formenctype as l_enctype and then a_enctype.same_string (l_enctype)))
end
- set_formmethod (a_method: READABLE_STRING_GENERAL)
+ set_formmethod (a_method: detachable READABLE_STRING_GENERAL)
-- Set `formmethod' with `a_method'.
-- Example:
--! require is_valid_method: [PUT, POST, DELETE, GET, ...]
require
- is_valid_as_string_8: a_method.is_valid_as_string_8
+ is_valid_as_string_8: a_method /= Void implies a_method.is_valid_as_string_8
do
- formmethod := a_method.to_string_8
+ if a_method = Void then
+ formmethod := Void
+ else
+ formmethod := a_method.to_string_8
+ end
ensure
- formmethod_set: attached formmethod as l_method implies l_method = a_method
+ formmethod_set: (a_method = Void implies formmethod = Void)
+ or (a_method /= Void implies (attached formmethod as l_method and then a_method.same_string (l_method)))
end
- set_formtarget (a_target: READABLE_STRING_GENERAL)
+ set_formtarget (a_target: detachable READABLE_STRING_GENERAL)
-- Set `formtarget' with `a_target'.
-- Example:
require
- is_valid_as_string_8: a_target.is_valid_as_string_8
+ is_valid_as_string_8: a_target /= Void implies a_target.is_valid_as_string_8
do
- formtarget := a_target.to_string_8
+ if a_target = Void then
+ formtarget := Void
+ else
+ formtarget := a_target.to_string_8
+ end
ensure
- formtarget_set: attached formtarget as l_target implies l_target = a_target
+ formtarget_set: (a_target = Void implies formtarget = Void)
+ or (a_target /= Void implies (attached formtarget as l_target and then a_target.same_string (l_target)))
end
diff --git a/library/server/wsf_html/widget/wsf_widget_composite.e b/library/server/wsf_html/widget/wsf_widget_composite.e
index eedcdafa..4cf11eec 100644
--- a/library/server/wsf_html/widget/wsf_widget_composite.e
+++ b/library/server/wsf_html/widget/wsf_widget_composite.e
@@ -1,8 +1,7 @@
note
- description : "Objects that ..."
- author : "$Author$"
- date : "$Date$"
- revision : "$Revision$"
+ description : "Objects containing WSF_WIDGET objects."
+ date: "$Date$"
+ revision: "$Revision$"
deferred class
WSF_WIDGET_COMPOSITE
diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf
index 6e3f66f6..c495cf7b 100644
--- a/library/server/wsf_html/wsf_html-safe.ecf
+++ b/library/server/wsf_html/wsf_html-safe.ecf
@@ -1,22 +1,3 @@
-
-
-
-
- /.git$
- /.svn$
- /EIFGENs$
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/library/server/wsf_html/wsf_html.ecf b/library/server/wsf_html/wsf_html.ecf
index aa888960..d4c2e4f9 100644
--- a/library/server/wsf_html/wsf_html.ecf
+++ b/library/server/wsf_html/wsf_html.ecf
@@ -1,15 +1,14 @@
-
+
- /.git$
- /.svn$
+ /\.git$
+ /\.svn$
/EIFGENs$
-
-
diff --git a/library/server/wsf_proxy/wsf_proxy-safe.ecf b/library/server/wsf_proxy/wsf_proxy-safe.ecf
index edcb930b..8e606137 100644
--- a/library/server/wsf_proxy/wsf_proxy-safe.ecf
+++ b/library/server/wsf_proxy/wsf_proxy-safe.ecf
@@ -1,35 +1,3 @@
-
-
-
-
-
-
-
-
-
-