Merge remote-tracking branch 'origin/master' into devel

This commit is contained in:
Vladimir Dubrovin 2014-04-21 01:27:28 +04:00
commit 9ab9c2524b
2 changed files with 2 additions and 0 deletions

1
.gitignore vendored
View File

@ -26,6 +26,7 @@ doc/html/index.html
*.var
verfile.sh
Makefile
Changelog
copytgz.sh
*~.nib
local.properties

View File

@ -174,6 +174,7 @@ param->srv->logfunc(param,buf);
!(strncasecmp((char *)buf, "RETR ", 5) && (param->operation = FTP_GET)) ||
!(strncasecmp((char *)buf, "LIST", 4) && (param->operation = FTP_LIST))||
!(strncasecmp((char *)buf, "NLST ", 5) && (param->operation = FTP_LIST)) ||
!(strncasecmp((char *)buf, "MLSD", 4) && (param->operation = FTP_LIST)) ||
!(strncasecmp((char *)buf, "APPE ", 5) && (param->operation = FTP_PUT)) ||
!(strncasecmp((char *)buf, "STOR ", 5) && (param->operation = FTP_PUT))
)){