ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,329 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

106 Commits

Author SHA1 Message Date
Isaac Connor c0e929f136 change regexp to handle quotes in the content-type line. This is needed for edimax cameras 2017-01-11 09:11:27 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 727d4b9714 add tests when select returns true, but no bytes available, in single image mode 2016-12-23 11:27:50 -05:00
Isaac Connor 61d3ecf9c1 when a socket times out, use getsockopt to see if there are any errors 2016-12-22 13:31:42 -05:00
Matt Durant 350352d956 Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1. 2016-08-31 20:56:30 -05:00
Isaac Connor eb30a9079e code style, commenting 2016-09-29 14:04:32 -04:00
Isaac Connor 8f33ed6ca6 introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started. 2016-09-15 11:16:05 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor 62a2ce56fb Merge Rotation/Orientation work, rename id to monitor_id in cameras and also make it an unsigned int since logically that is what it is. Also some fixups for bad rtsp h264 streams. 2016-08-10 12:19:53 -04:00
Isaac Connor 1383e0b774 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-06-22 09:41:47 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor 6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor 56d95bb949 Merge branch 'iconnor_video' into storageareas 2016-03-31 14:02:56 -04:00
Isaac Connor c26dbb9028 rough in record_audio, and do lots of whitespace cleanups 2016-03-31 12:54:56 -04:00
Isaac Connor 58f19f14e1 print ip and hostname when can't connect 2016-03-29 11:51:58 -04:00
Isaac Connor 96ff5ec619 include netinet/in.h for FreeBSD so that we can do ipv6 ip lookups 2016-03-28 05:39:26 -04:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-08 20:41:36 +11:00
SteveGilvarry af76d19646 Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
Isaac Connor 994de4ae0a Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available. 2015-07-06 15:57:06 -04:00
Isaac Connor 95d7a3ff94 alter the logic of ReadData. New behaviour is documented. This solves unneccessary disconnects for me. 2015-06-04 11:33:03 -04:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 
haven't attempted to build yet, there are some changes
 2015-05-17 17:18:54 -07:00
Isaac Connor 4c7e8592d0 fix content-type parsing when there are options on it 2015-02-04 13:53:42 -05:00
Isaac Connor 1abe35c576 change Debug level of this line to something higher 2015-02-03 14:33:23 -05:00
Isaac Connor e6d47781d3 add Digest Authentication handling for simple http method. 2014-11-28 15:56:58 -05:00
Isaac Connor 9eda71570a merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
Isaac Connor 0b5a0df7dc implement http_Digest Auth, and improve it for rtsp 
Conflicts:
	src/zm_remote_camera_http.cpp
	src/zm_rtsp.cpp
 2014-11-20 10:33:58 -05:00
Kfir Itzhak 88f2bc6b63 Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess 2013-11-24 15:37:47 +02:00
Kfir Itzhak eff58367b4 IPv6 improvements 2013-11-22 15:30:05 +02:00
Kfir Itzhak 6a23a051c6 Merge pull request #252 from guotie/master 
ipv6 support to http remote camera code
 2013-11-19 06:27:20 -08:00
Kfir Itzhak 4e1d23669f Revert content_length to be int 2013-11-04 10:54:39 +02:00
Joe Evans 550040474f Cast content_length to signed int for error-check comparison, preventing segfault when attempting to read buffer. 2013-11-01 14:11:48 -07:00
guotie 557c0a3d30 Update zm_remote_camera_http.cpp 2013-10-11 14:31:37 +08:00
guotie 042e50eecc Update zm_remote_camera_http.cpp 2013-10-11 14:28:43 +08:00
mastertheknife 5a9364703c a better fix for the sign comparison warnings during compilation 2013-09-17 10:28:59 +03:00
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 2013-07-25 11:49:55 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 4a59761bcc Getting closer and closer everyday. 
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
 2012-02-01 07:33:20 +02:00
stan 4891781523 Fixed issue with single image capture from cameras that don't provide content length 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3484 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-27 16:08:48 +00:00
stan 46d777398e Updated to use fixed buffer sizes rather than relying on o/s defined. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:22:35 +00:00
stan 60f0136ed3 Merged in image root changes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 19:16:40 +00:00
stan e30ae4fa0e Only send http Keep-alive header for http 1.0 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2992 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-11-24 11:40:04 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan c65b50e312 Minor header sort out and libz no longer mandatory. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2809 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-20 12:39:29 +00:00
stan dde584a12a Restructured camera capture methods somewhat and revamped V4L stuff a bit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 09:48:06 +00:00
stan e33fc4cd60 Added proper check for http methods. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2695 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 19:05:35 +00:00
stan a91d2a0697 Rationalised and renamed buffer class. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2657 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-09 09:15:23 +00:00
stan e6041e24a7 Uppdated copyright headers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:33:23 +00:00
stan f6a029bc4d Updated properties 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2608 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:08:15 +00:00
stan 8a1b646834 Correct issue where address of strings was being taken rather than contents 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2600 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-24 15:52:52 +00:00
stan ad5de3749f Bug 485 - Fixed usecs values of HTTP timeout 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2593 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-23 09:21:19 +00:00
stan d598f54210 Merged in V4L2 initial changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2582 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:20:52 +00:00
stan aa26ab7b18 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:35:59 +00:00