1
0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-06-09 06:10:41 +00:00

Compare commits

..

5 Commits

Author SHA1 Message Date
Stephan Jauernick
abe090a634 DNU - hint at docu change regarding CI and submodules 2024-01-06 03:07:34 +01:00
Stephan Jauernick
5aa41b8133 DNU WIP ci changes 2024-01-05 19:17:20 +01:00
Stephan Jauernick
022d2ab655 WIP ci changes 2024-01-05 19:17:20 +01:00
Philipp Schafft
7f6abb6ca8 Fix: Typo SROUCE_HIDDEN -> SOURCE_HIDDEN
Thanks to Jordan Erickson for finding this.
2023-08-02 00:19:15 +00:00
Philipp Schafft
70067b12be Fix: Fixed clients in body queue running in undetected EOFs
Thanks to Jordan Erickson
2023-08-02 00:19:12 +00:00
4 changed files with 17 additions and 4 deletions

View File

@ -1,6 +1,8 @@
Icecast 2 - README
---------------------------------------------------------------------
TODO: add info regarding forks and expected repo layout in gitlab/*blub*
[![Build Status](https://travis-ci.org/xiph/Icecast-Server.svg?branch=master)](https://travis-ci.org/xiph/Icecast-Server)
Icecast is a streaming media server which currently supports _WebM_ and

View File

@ -1019,6 +1019,7 @@ client_slurp_result_t client_body_skip(client_t *client)
{
char buf[2048];
int ret;
ssize_t got;
ICECAST_LOG_DEBUG("Slurping client %p", client);
@ -1038,8 +1039,17 @@ client_slurp_result_t client_body_skip(client_t *client)
if (left > sizeof(buf))
left = sizeof(buf);
client_body_read(client, buf, left);
got = client_body_read(client, buf, left);
} else {
got = client_body_read(client, buf, sizeof(buf));
}
if (got < 1) {
ICECAST_LOG_DEBUG("Slurping client %p ... got no data EOF or needs more data", client);
return CLIENT_SLURP_ERROR;
}
if (client->request_body_length != -1) {
if ((size_t)client->request_body_length == client->request_body_read) {
ICECAST_LOG_DEBUG("Slurping client %p ... was a success", client);
return CLIENT_SLURP_SUCCESS;
@ -1047,8 +1057,6 @@ client_slurp_result_t client_body_skip(client_t *client)
ICECAST_LOG_DEBUG("Slurping client %p ... needs more data", client);
return CLIENT_SLURP_NEEDS_MORE_DATA;
}
} else {
client_body_read(client, buf, sizeof(buf));
}
ret = client_body_eof(client);

View File

@ -737,6 +737,8 @@ static client_slurp_result_t process_request_body_queue_one(client_queue_entry_t
client_t *client = node->client;
client_slurp_result_t res;
node->ready = false;
if (client->parser->req_type == httpp_req_post) {
if (node->bodybuffer == NULL && client->request_body_read == 0) {
if (client->request_body_length < 0) {

View File

@ -182,7 +182,8 @@ static inline void __setup_environ(ice_config_t *config, event_exec_t *self, eve
if (source) {
__update_environ("SOURCE_MOUNTPOINT", source->mount);
__update_environ("SOURCE_PUBLIC", source->yp_public ? "true" : "false");
__update_environ("SROUCE_HIDDEN", source->hidden ? "true" : "false");
__update_environ("SOURCE_HIDDEN", source->hidden ? "true" : "false");
__update_environ("SROUCE_HIDDEN", source->hidden ? "true" : "false"); /* Typo, kept for compatibility */
}
avl_tree_unlock(global.source_tree);
}