Browse Source

* Fix CRLF parsing

* Fix pidfile in start script
rspamd-0.5
Vsevolod Stakhov 16 years ago
parent
commit
3dd95c9525
  1. 3
      freebsd/rspamd.sh.in
  2. 2
      src/buffer.c

3
freebsd/rspamd.sh.in

@ -19,7 +19,6 @@ procname="@CMAKE_INSTALL_PREFIX@/bin/rspamd"
restart_precmd="rspamd_checkconfig"
reload_precmd="rspamd_checkconfig"
configtest_cmd="rspamd_checkconfig"
pidfile="/var/run/rspamd/rspamd.pid"
load_rc_config $name
@ -28,6 +27,8 @@ load_rc_config $name
: ${rspamd_user="@RSPAMD_USER@"}
: ${rspamd_group="@RSPAMD_GROUP@"}
pidfile="$rspamd_pidfile"
stop_postcmd="rm -f $rspamd_pidfile"
rspamd_checkconfig()

2
src/buffer.c

@ -201,7 +201,7 @@ read_buffers (int fd, rspamd_io_dispatcher_t *d, gboolean skip_read)
if (*c == '\n') {
res.begin = b;
res.len = r;
if (*(c - 1) == '\r') {
if (r != 0 && *(c - 1) == '\r') {
res.len --;
}
if (d->read_callback) {

Loading…
Cancel
Save