From 1ab5221db5c8eb579b0e2721b16bb81474ad328f Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Mon, 21 Jan 2008 23:35:08 +0000 Subject: [PATCH] Fix for isFileInVirtualDir. Thanks to Peter Hartley for the patch. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@290 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- ChangeLog | 4 ++++ THANKS | 1 + upnp/src/genlib/net/http/webserver.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 21dc7fd..04e6447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,10 +9,14 @@ Version 1.6.4 @name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302] Also, the documentation file name was mispelled and was corrected in the Makefile.am. + 2008-01-07 Marcelo Jimenez * Putting back a "defined(__OSX__)" that has been removed in the previous *BSD patch. Thanks to Chris Pickel for pointing it out. +2008-01-21 Marcelo Jimenez + * Fix for isFileInVirtualDir. Thanks to Peter Hartley for the patch. + ******************************************************************************* Version 1.6.3 ******************************************************************************* diff --git a/THANKS b/THANKS index 3dbcc08..2e85999 100644 --- a/THANKS +++ b/THANKS @@ -36,6 +36,7 @@ exempt of errors. - Oskar Liljeblad - Michael (oxygenic) - Paul Vixie +- Peter Hartley - Rene Hexel - Robert Gingher (robsbox) - Siva Chandran diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c index f57db13..ee2feca 100644 --- a/upnp/src/genlib/net/http/webserver.c +++ b/upnp/src/genlib/net/http/webserver.c @@ -745,7 +745,7 @@ isFileInVirtualDir( IN char *filePath ) return TRUE; } else { if( ( strncmp( pCurVirtualDir->dirName, filePath, webDirLen ) - == 0 ) && ( filePath[webDirLen] == '/' ) ) + == 0 ) && ( filePath[webDirLen] == '/' || filePath[webDirLen] == '\0' ) ) return TRUE; }