Merge branch 'ZoneMinder:master' into master

.eslintrc.js

@@ -3,7 +3,7 @@
 module.exports = {
   "env": {
     "browser": true,
-    "es6": true,
+    "es2017": true,
   },
   "extends": ["google"],
   "overrides": [{

README.md

@@ -4,7 +4,6 @@ ZoneMinder
 [![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder)
 [![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
 [![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE)
-[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder)
 
 All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
 

src/zm_eventstream.cpp

@@ -1126,7 +1126,8 @@ bool EventStream::send_file(const std::string &filepath) {
   } else {
     Debug(1, "Failed to sendfile?");
   }
-  Warning("Unable to send raw frame %ld: %s rc %d", curr_frame_id, strerror(errno), rc);
+  Warning("Unable to send raw frame %ld: %s rc %d != %d",
+      curr_frame_id, strerror(errno), rc, (int)filestat.st_size);
 #endif
 
   static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];