storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Avoid using '&' in URIs for resized images, to avoid client compatibility issues.

Browse Source
This commit is contained in:
Justin Maggard 2009-08-06 07:50:12 +00:00
parent e925174081
commit aba116a445
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upnphttp.c
View File

@ -1321,7 +1321,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
path = strdup(object); path = strdup(object);
if( strtok_r(path, "?", &saveptr) ) if( strtok_r(path, "?", &saveptr) )
{ {
item = strtok_r(NULL, "&", &saveptr); item = strtok_r(NULL, "&,", &saveptr);
} }
while( item != NULL ) while( item != NULL )
{ {
@ -1347,7 +1347,7 @@ SendResp_resizedimg(struct upnphttp * h, char * object)
{ {
pixelshape = val; pixelshape = val;
} }
item = strtok_r(NULL, "&", &saveptr); item = strtok_r(NULL, "&,", &saveptr);
} }
free(path); free(path);

4
upnpsoap.c
View File

@ -503,7 +503,7 @@ callback(void *args, int argc, char **argv, char **azColName)
char str_buf[512]; char str_buf[512];
char **result; char **result;
int children, ret = 0; int children, ret = 0;
static int warned = 0; static short int warned = 0;
/* Make sure we have at least 4KB left of allocated memory to finish the response. */ /* Make sure we have at least 4KB left of allocated memory to finish the response. */
if( passed_args->size > 1044480 && !warned ) if( passed_args->size > 1044480 && !warned )
@ -720,7 +720,7 @@ callback(void *args, int argc, char **argv, char **azColName)
passed_args->size += ret; passed_args->size += ret;
ret = sprintf(str_buf, "<res resolution=\"%dx%d\" " ret = sprintf(str_buf, "<res resolution=\"%dx%d\" "
"protocolInfo=\"http-get:*:%s:%s\">" "protocolInfo=\"http-get:*:%s:%s\">"
"http://%s:%d/Resized/%s.jpg?width=%d&height=%d" "http://%s:%d/Resized/%s.jpg?width=%d,height=%d"
"</res>", "</res>",
dstw, dsth, dstw, dsth,
mime, "DLNA.ORG_PN=JPEG_SM", lan_addr[0].str, runtime_vars.port, mime, "DLNA.ORG_PN=JPEG_SM", lan_addr[0].str, runtime_vars.port,