aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2008-03-09 21:28:42 +0000
committerAlexey Shchepin <alexey@process-one.net>2008-03-09 21:28:42 +0000
commit5cb8f4826cac9b0c71062d1d50034e52ac4282bd (patch)
treef0c96707b13ac9a1563c97b9b792ec48d55c85a8
parent* src/mod_proxy65/mod_proxy65_service.erl: Implement alternative (diff)
* src/web/ejabberd_http_poll.erl: Fixed HTTP headers when a
requested session doesn't exist SVN Revision: 1223
-rw-r--r--ChangeLog23
-rw-r--r--src/web/ejabberd_http_poll.erl2
2 files changed, 1 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 20f1afde6..6cf244906 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,3 @@
-2008-03-09 Badlop <badlop@process-one.net>
-
- * src/mod_proxy65/mod_proxy65_service.erl: Implement alternative
- to the deprecated function inet:ip_to_bytes (thanks to Evgeniy
- Khramtsov)(EJAB-542)
-
-2008-03-07 Mickael Remond <mremond@process-one.net>
-
- * src/eldap/eldap_pool.erl: Improved logging
-
-2008-03-04 Badlop <badlop@process-one.net>
-
- * doc/guide.tex: Improve documentation of host_config
- add (EJAB-544)
- * doc/guide.html: Likewise
- * src/ejabberd.cfg.example: Likewise
- * src/ejabberd_config.erl: Likewise
-
- * doc/guide.tex: mod_announce recommends, but doesn't require
- mod_adhoc (thanks to Anastasia Gornostaeva)
- * doc/guide.html: Likewise
- * src/ejabberd.cfg.example: Likewise
-
2008-03-03 Alexey Shchepin <alexey@process-one.net>
* src/tls/tls.erl: recv_data/2 doesn't throw exceptions now
diff --git a/src/web/ejabberd_http_poll.erl b/src/web/ejabberd_http_poll.erl
index 281a2aea6..4573b12da 100644
--- a/src/web/ejabberd_http_poll.erl
+++ b/src/web/ejabberd_http_poll.erl
@@ -134,7 +134,7 @@ process([], #request{data = Data} = _Request) ->
end,
case http_get(ID) of
{error, not_exists} ->
- {200, [?BAD_REQUEST], ""};
+ {200, ?BAD_REQUEST, ""};
{ok, OutPacket} ->
if
ID == ID1 ->