* NOTE: MaRequest::setVar does not copy into globals, whereas espSetVar
* does if legacy_api is defined. So variables pre-defined by MaRequest
* must be copied here into globals[].\r
- *\r
- * NOTE: if a variable is in session[] and in form[], the form[] will\r
- * override being later in the variables[] list. Use mprSetProperty \r
+ *
+ * NOTE: if a variable is in session[] and in form[], the form[] will
+ * override being later in the variables[] list. Use mprSetProperty
* instead of mprCreateProperty to cover for this case.
*/
for (i = 0; i < ESP_OBJ_MAX; i++) {
state = ESP_STATE_BEGIN;
break;
- case ESP_TOK_INCLUDE:\r
- if (parse.token[0] == '/') {\r
- mprStrcpy(incPath, sizeof(incPath), parse.token);\r
- } else {\r
- mprGetDirName(dir, sizeof(dir), ep->uri);\r
- mprSprintf(incPath, sizeof(incPath), "%s/%s", \r
- dir, parse.token);\r
+ case ESP_TOK_INCLUDE:
+ if (parse.token[0] == '/') {
+ mprStrcpy(incPath, sizeof(incPath), parse.token);
+ } else {
+ mprGetDirName(dir, sizeof(dir), ep->uri);
+ mprSprintf(incPath, sizeof(incPath), "%s/%s",
+ dir, parse.token);
}
if (esp->mapToStorage(ep->requestHandle, path, sizeof(path),
incPath, 0) < 0) {
*/
incBuf = 0;
if ((rc = buildScript(ep, &incBuf, incText, errMsg)) < 0) {
- mprFree(incText);\r
- mprFree(parse.token);\r
+ mprFree(incText);
+ mprFree(parse.token);
return rc;
- }\r
-\r
+ }
+
len = mprReallocStrcat(jsBuf, maxScriptSize, len, 0, incBuf, 0);
mprFree(incText);
mprFree(incBuf);
}
tid = getEspToken(state, &parse);
}
- mprFree(parse.token);\r
- if (len < 0) {\r
- mprAllocSprintf(errMsg, MPR_MAX_STRING, \r
- "Script token is too big in %s.\nConfigured maximum is %d.", \r
- path, maxScriptSize);\r
- return MPR_ERR_WONT_FIT;\r
+ mprFree(parse.token);
+ if (len < 0) {
+ mprAllocSprintf(errMsg, MPR_MAX_STRING,
+ "Script token is too big in %s.\nConfigured maximum is %d.",
+ path, maxScriptSize);
+ return MPR_ERR_WONT_FIT;
}
return rc;
}