Commit b77532ea authored by Sergey Lyubka's avatar Sergey Lyubka

Added mjpg example

parent ed8168e8
...@@ -48,6 +48,10 @@ upload: upload.c ../mongoose.c ...@@ -48,6 +48,10 @@ upload: upload.c ../mongoose.c
auth: auth.c ../mongoose.c auth: auth.c ../mongoose.c
$(CC) auth.c ../mongoose.c $(OUT) $(CFLAGS) $(CC) auth.c ../mongoose.c $(OUT) $(CFLAGS)
mjpg: mjpg.c ../mongoose.c
$(CC) mjpg.c ../mongoose.c $(OUT) $(CFLAGS)
websocket_html.c: websocket.html websocket_html.c: websocket.html
perl mkdata.pl $< > $@ perl mkdata.pl $< > $@
...@@ -55,4 +59,4 @@ u: ...@@ -55,4 +59,4 @@ u:
g++ unit_test.c -Wall -W -pedantic -lssl -g -O0 $(CFLAGS_EXTRA) && ./a.out g++ unit_test.c -Wall -W -pedantic -lssl -g -O0 $(CFLAGS_EXTRA) && ./a.out
clean: clean:
-@$(RM) hello upload post websocket auth server multi_threaded websocket_html.c *.exe *.dSYM *.obj .*o -@$(RM) hello mjpg upload post websocket auth server multi_threaded websocket_html.c *.exe *.dSYM *.obj .*o
...@@ -4783,6 +4783,10 @@ static void mg_ev_handler(struct ns_connection *nc, enum ns_event ev, void *p) { ...@@ -4783,6 +4783,10 @@ static void mg_ev_handler(struct ns_connection *nc, enum ns_event ev, void *p) {
break; break;
case NS_POLL: case NS_POLL:
if (call_user(conn, MG_POLL) == MG_TRUE) {
nc->flags |= NSF_FINISHED_SENDING_DATA;
}
if (conn != NULL && conn->endpoint_type == EP_FILE) { if (conn != NULL && conn->endpoint_type == EP_FILE) {
transfer_file_data(conn); transfer_file_data(conn);
} }
......
...@@ -58,7 +58,7 @@ struct mg_connection { ...@@ -58,7 +58,7 @@ struct mg_connection {
}; };
struct mg_server; // Opaque structure describing server instance struct mg_server; // Opaque structure describing server instance
enum mg_result { MG_FALSE, MG_TRUE }; enum mg_result { MG_FALSE, MG_TRUE, MG_MORE };
enum mg_event { enum mg_event {
MG_POLL = 100, // Callback return value is ignored MG_POLL = 100, // Callback return value is ignored
MG_CONNECT, // If callback returns MG_FALSE, connect fails MG_CONNECT, // If callback returns MG_FALSE, connect fails
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment