Merge branch 'master' into concurrent_httpd

- Updated JSON parser library - Removed obsolete calls on json parser library.
2015-04-08 16:16:04 +02:00
parent cf549e8f62 881625a0f6
commit 3b375e12ca
81 changed files with 3970 additions and 2939 deletions
--- a/examples/upload_image/src/image_uploader.e
+++ b/examples/upload_image/src/image_uploader.e
@@ -12,6 +12,8 @@ inherit

 	WSF_DEFAULT_SERVICE [IMAGE_UPLOADER_EXECUTION]

+	SHARED_EXECUTION_ENVIRONMENT
+
 create
 	make

@@ -26,11 +28,6 @@ feature {NONE} -- Initialization
 			make_and_launch
 		end

-	setup_router
-		do
-
-		end
-
 note
 	copyright: "2011-2012, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"