diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-13 00:43:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:22:58 -0500 |
| commit | 8fc8fa2ad4e38751205afc089c957d38e5fc9384 (patch) | |
| tree | 7195be3cdb4209bf9572e9ee48c48c62a43f9cde /source4/lib/appweb/esp/espProcs.c | |
| parent | b4f6a348bb512071af685f4c9e0fe86f6eb81a75 (diff) | |
| download | samba-8fc8fa2ad4e38751205afc089c957d38e5fc9384.tar.gz samba-8fc8fa2ad4e38751205afc089c957d38e5fc9384.tar.bz2 samba-8fc8fa2ad4e38751205afc089c957d38e5fc9384.zip | |
r8404: small upstream merges of appweb code
(This used to be commit 205ff9a82bd51eae3c1400ea0a24fcf2a662e96f)
Diffstat (limited to 'source4/lib/appweb/esp/espProcs.c')
| -rw-r--r-- | source4/lib/appweb/esp/espProcs.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/lib/appweb/esp/espProcs.c b/source4/lib/appweb/esp/espProcs.c index 28b69a8a6f..7b5dfe680e 100644 --- a/source4/lib/appweb/esp/espProcs.c +++ b/source4/lib/appweb/esp/espProcs.c @@ -93,8 +93,11 @@ static int includeProc(EspRequest *ep, int argc, char **argv) buf[size] = '\0'; extension = strrchr(argv[i], '.'); - /* this makes handling include files in esp scripts much more convenient */ - if (extension && strcasecmp(extension, ".esp") == 0) { + + /* + * Allow nested inclusion of ESP requests + */ + if (extension && mprStrCmpAnyCase(extension, ".esp") == 0) { if (espProcessRequest(ep, path, buf, &emsg) != 0) { espError(ep, "Cant evaluate script - %s", emsg?emsg:""); mprFree(buf); |