"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "upnphttp.c" between
minidlna-1.2.0.tar.gz and minidlna-1.2.1.tar.gz

About: ReadyMedia (formerly known as MiniDLNA) is a simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients.

upnphttp.c  (minidlna-1.2.0):upnphttp.c  (minidlna-1.2.1)
skipping to change at line 633 skipping to change at line 633
"<h2>" SERVER_NAME " status</h2></div>"); "<h2>" SERVER_NAME " status</h2></div>");
strcatf(&str, strcatf(&str,
"<h3>Media library</h3>" "<h3>Media library</h3>"
"<table border=1 cellpadding=10>" "<table border=1 cellpadding=10>"
"<tr><td>Audio files</td><td>%d</td></tr>" "<tr><td>Audio files</td><td>%d</td></tr>"
"<tr><td>Video files</td><td>%d</td></tr>" "<tr><td>Video files</td><td>%d</td></tr>"
"<tr><td>Image files</td><td>%d</td></tr>" "<tr><td>Image files</td><td>%d</td></tr>"
"</table>", a, v, p); "</table>", a, v, p);
if (scanning) if (GETFLAG(SCANNING_MASK))
strcatf(&str, strcatf(&str,
"<br><i>* Media scan in progress</i><br>"); "<br><i>* Media scan in progress</i><br>");
strcatf(&str, strcatf(&str,
"<h3>Connected clients</h3>" "<h3>Connected clients</h3>"
"<table border=1 cellpadding=10>" "<table border=1 cellpadding=10>"
"<tr><td>ID</td><td>Type</td><td>IP Address</td><td>HW Address</t d><td>Connections</td></tr>"); "<tr><td>ID</td><td>Type</td><td>IP Address</td><td>HW Address</t d><td>Connections</td></tr>");
for (i = 0; i < CLIENT_CACHE_SLOTS; i++) for (i = 0; i < CLIENT_CACHE_SLOTS; i++)
{ {
if (!clients[i].addr.s_addr) if (!clients[i].addr.s_addr)
skipping to change at line 1362 skipping to change at line 1362
DPRINTF(E_ERROR, L_HTTP, "Error resolving path %s: %s\n", DPRINTF(E_ERROR, L_HTTP, "Error resolving path %s: %s\n",
orig_path, strerror(errno)); orig_path, strerror(errno));
return -1; return -1;
} }
for (media_path = media_dirs; media_path; media_path = media_path ->next) for (media_path = media_dirs; media_path; media_path = media_path ->next)
{ {
if (strncmp(path, media_path->path, strlen(media_path->pa th)) == 0) if (strncmp(path, media_path->path, strlen(media_path->pa th)) == 0)
break; break;
} }
if (!media_path && strncmp(path, db_path, strlen(db_path))) if (!media_path && strncmp(path, db_path, strlen(db_path)))
{ {
DPRINTF(E_ERROR, L_HTTP, "Rejecting wide link %s -> %s\n" , DPRINTF(E_ERROR, L_HTTP, "Rejecting wide link %s -> %s\n" ,
orig_path, path); orig_path, path);
return -403; return -403;
} }
} }
else else
path = orig_path; path = orig_path;
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)