diff --git a/BSD_LICENSE b/BSD_LICENSE index bc06a2c..88180d6 100644 --- a/BSD_LICENSE +++ b/BSD_LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2010, Chandrashekhar Mullaparthi +Copyright (c) 2005-2013, Chandrashekhar Mullaparthi All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/CHANGELOG b/CHANGELOG index 7bfa5e0..17749c7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ CONTRIBUTIONS & CHANGE HISTORY ============================== +09-04-2013 - v4.0.2 + * Tagging master with new version to cover changes + contributed over the past few months via various pull requests + 07-08-2012 - v4.0.1 * Fix issue 67 properly. diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d38c240..f1bb4c8 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -42,3 +42,11 @@ fholzhauser (https://github.com/fholzhauser/) hyperthunk (https://github.com/hyperthunk/) Mistagrooves (https://github.com/Mistagrooves/) tholschuh (https://github.com/tholschuh/) +https://github.com/nrdufour +https://github.com/helllamer +https://github.com/rflynn +https://github.com/puzza007 +https://github.com/marutha +https://github.com/dis +https://github.com/pib + diff --git a/LICENSE b/LICENSE index c5c0c8d..e260a55 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ ibrowse - a HTTP client written in erlang -Copyright (C) 2005-2010 Chandrashekhar Mullaparthi +Copyright (C) 2005-2013 Chandrashekhar Mullaparthi This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. diff --git a/README.md b/README.md index 2052ad7..0af5161 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ibrowse is a HTTP client written in erlang. **Comments to:** chandrashekhar.mullaparthi@gmail.com -**Current Version:** 4.0.1 +**Current Version:** 4.0.2 **Latest Version:** git://github.com/cmullaparthi/ibrowse.git diff --git a/priv/ibrowse.conf b/priv/ibrowse.conf index 811f55e..c142601 100644 --- a/priv/ibrowse.conf +++ b/priv/ibrowse.conf @@ -15,4 +15,3 @@ %% If SSL is to be used, both the options, is_ssl and ssl_options MUST be specified %% where option() is all options supported in the ssl module -%% {{options, "www.google.co.uk", 80}, [{proxy_host, "proxy"}, {proxy_port, 8080}, {proxy_user, "cmullaparthi"}, {proxy_password, "20nov99"}]}. diff --git a/src/ibrowse.app.src b/src/ibrowse.app.src index 1d88084..a7993f3 100644 --- a/src/ibrowse.app.src +++ b/src/ibrowse.app.src @@ -1,6 +1,6 @@ {application, ibrowse, [{description, "Erlang HTTP client application"}, - {vsn, "4.0.1"}, + {vsn, "4.0.2"}, {registered, [ibrowse_sup, ibrowse]}, {applications, [kernel,stdlib]}, {env, []},