Attachment #94940 for bug #144861




    int rc;
    char *start;
    char versionbuf[64];
    char stempbr[MAX_ICY_STRING];
    URLINFO url_info;
    int url_path_len;
    int content_type_by_url;

    else if ((start = (char *)strstr(header, "SHOUTcast")) != NULL) {
	strcpy(info->server, "SHOUTcast/");
	if ((start = (char *)strstr(start, "Server/")) != NULL) {
	    sscanf(start, "Server/%63[^<]<", versionbuf);
	    strcat(info->server, versionbuf);
	}


	if (!info->server[0]) {
	    strcpy(info->server, "icecast/");
	    if ((start = (char *)strstr(start, "version ")) != NULL) {
		sscanf(start, "version %63[^<]<", versionbuf);
		strcat(info->server, versionbuf);
	    }
	}

Return to bug 144861

Lines 212-218 httplib_parse_sc_header(const char *url, Link Here

(-)lib/http.c.old (-3 / +3 lines)
212	int rc;	212	int rc;
213	char *start;	213	char *start;
214	char versionbuf[64];	214	char versionbuf[64];
215	char stempbr[50];	215	char stempbr[MAX_ICY_STRING];
216	URLINFO url_info;	216	URLINFO url_info;
217	int url_path_len;	217	int url_path_len;
218	int content_type_by_url;	218	int content_type_by_url;
Lines 328-334 httplib_parse_sc_header(const char *url, Link Here
328	else if ((start = (char *)strstr(header, "SHOUTcast")) != NULL) {	328	else if ((start = (char *)strstr(header, "SHOUTcast")) != NULL) {
329	strcpy(info->server, "SHOUTcast/");	329	strcpy(info->server, "SHOUTcast/");
330	if ((start = (char *)strstr(start, "Server/")) != NULL) {	330	if ((start = (char *)strstr(start, "Server/")) != NULL) {
331	sscanf(start, "Server/%[^<]<", versionbuf);	331	sscanf(start, "Server/%63[^<]<", versionbuf);
332	strcat(info->server, versionbuf);	332	strcat(info->server, versionbuf);
333	}	333	}
334		334
Lines 346-352 httplib_parse_sc_header(const char *url, Link Here
346	if (!info->server[0]) {	346	if (!info->server[0]) {
347	strcpy(info->server, "icecast/");	347	strcpy(info->server, "icecast/");
348	if ((start = (char *)strstr(start, "version ")) != NULL) {	348	if ((start = (char *)strstr(start, "version ")) != NULL) {
349	sscanf(start, "version %[^<]<", versionbuf);	349	sscanf(start, "version %63[^<]<", versionbuf);
350	strcat(info->server, versionbuf);	350	strcat(info->server, versionbuf);
351	}	351	}
352	}	352	}