summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-13 22:07:17 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-13 22:07:17 +0000
commita7e625fc7e4d4e033f57a8ded8f47bb8a9298f82 (patch)
tree379cb73197ddb183d6f7828e173ea9b9819d3808
parent95e5df63d15f5c84e2b4e24b8a69c4ced8551a03 (diff)
downloadzabbix-a7e625fc7e4d4e033f57a8ded8f47bb8a9298f82.tar.gz
zabbix-a7e625fc7e4d4e033f57a8ded8f47bb8a9298f82.tar.xz
zabbix-a7e625fc7e4d4e033f57a8ded8f47bb8a9298f82.zip
- [ZBX-160] fixed web.page.get to send \r\n instead of \n (Alexei)
[svn merge -r5007:5016 svn://svn.zabbix.com/branches/1.4] git-svn-id: svn://svn.zabbix.com/trunk@5017 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--src/libs/zbxsysinfo/common/http.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a7c1c274..5cd1d41b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ Changes for 1.5:
Changes for 1.4.3:
+ - [ZBX-160] fixed web.page.get to send \r\n instead of \n (Alexei)
- [ZBX-149] fixed incorrect processing of vm.memory.size key in FreeBSD (Sasha)
- [ZBX-109] added support of vm.memory.size[pfree] Linux, FreeBSD & Win agents (Sasha)
- [ZBX-122] Hungarian translate
diff --git a/src/libs/zbxsysinfo/common/http.c b/src/libs/zbxsysinfo/common/http.c
index 4e49e304..c3fe9097 100644
--- a/src/libs/zbxsysinfo/common/http.c
+++ b/src/libs/zbxsysinfo/common/http.c
@@ -42,7 +42,9 @@ static int get_http_page(char *host, char *param, unsigned short port, char *buf
if( SUCCEED == (ret = zbx_tcp_connect(&s, host, port)) )
{
- zbx_snprintf(request, sizeof(request), "GET /%s HTTP/1.1\nHost: %s\nConnection: close\n\n", param, host);
+ zbx_snprintf(request, sizeof(request), "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\n\r\n",
+ param,
+ host);
if( SUCCEED == (ret = zbx_tcp_send_raw(&s, request)) )
{