mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2025-02-02 15:07:36 -05:00
minor cleanups
svn path=/icecast/trunk/icecast/; revision=8236
This commit is contained in:
parent
7dfcbf560c
commit
c7432d6602
@ -90,6 +90,7 @@
|
||||
<dump-file>/tmp/dump-example1.ogg</dump-file>
|
||||
<burst-size>65536</burst-size>
|
||||
<fallback-mount>/example2.ogg</fallback-mount>
|
||||
<fallback-override>1</fallback-override>
|
||||
<authentication type="htpasswd">
|
||||
<option name="filename" value="myauth"/>
|
||||
<option name="allow_duplicate_users" value="0"/>
|
||||
|
@ -13,12 +13,15 @@
|
||||
#ifndef __AUTH_H__
|
||||
#define __AUTH_H__
|
||||
|
||||
#include "source.h"
|
||||
#include "client.h"
|
||||
#include "config.h"
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <libxml/xmlmemory.h>
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/tree.h>
|
||||
#include "source.h"
|
||||
#include "client.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
@ -74,8 +74,9 @@ int format_get_plugin(format_type_t type, source_t *source)
|
||||
default:
|
||||
break;
|
||||
}
|
||||
stats_event (source->mount, "content-type",
|
||||
source->format->contenttype);
|
||||
if (ret < 0)
|
||||
stats_event (source->mount, "content-type",
|
||||
source->format->contenttype);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -390,6 +390,7 @@ int fserve_client_create(client_t *httpclient, char *path)
|
||||
|
||||
global_lock();
|
||||
if(global.clients >= client_limit) {
|
||||
global_unlock();
|
||||
httpclient->respcode = 504;
|
||||
bytes = sock_write(httpclient->con->sock,
|
||||
"HTTP/1.0 504 Server Full\r\n"
|
||||
@ -397,7 +398,6 @@ int fserve_client_create(client_t *httpclient, char *path)
|
||||
"<b>Server is full, try again later.</b>\r\n");
|
||||
if(bytes > 0) httpclient->con->sent_bytes = bytes;
|
||||
fserve_client_destroy(client);
|
||||
global_unlock();
|
||||
return -1;
|
||||
}
|
||||
global.clients++;
|
||||
|
@ -33,7 +33,9 @@
|
||||
* and type definitions
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
#include "compat.h"
|
||||
#include "md5.h"
|
||||
|
||||
@ -185,7 +187,7 @@ void MD5Final(unsigned char digest[HASH_LEN], struct MD5Context *ctx)
|
||||
# define F4(x, y, z) (y ^ (x | ~z))
|
||||
|
||||
/* This is the central step in the MD5 algorithm. */
|
||||
# define MD5STEP(f, w, x, y, z, data, s) w += f(x, y, z) + data; w = (w<<s) | (w>>(32-s)); w += x
|
||||
# define MD5STEP(f, w, x, y, z, data, s) do { w += f(x, y, z) + data; w = (w<<s) | (w>>(32-s)); w += x; }while(0)
|
||||
|
||||
/*
|
||||
* The core of the MD5 algorithm, this alters an existing MD5 hash to
|
||||
|
Loading…
Reference in New Issue
Block a user