New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add cURL source type #297
Merged
Merged
Add cURL source type #297
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: CMakeLists.txt src/CMakeLists.txt src/zm_camera.h src/zm_monitor.cpp web/skins/classic/views/console.php web/skins/classic/views/monitor.php
Any objections? |
Can you add the SQL statements to /db/zm_update-1.26.6.sql to this pull request? |
Hi, Its already there. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At this moment only JPEG (single image) and MJPEG (image stream) are supported.
Digest authentication and other HTTP/1.1 features are fully supported in cURL.
The cURL docs say not to put the username and password in the URL field, but store them in separate fields, so 2 new fields need to be added to the Monitors table: