Skip to content

Commit 4c16737

Browse files
author
Michael O'Brien
committed
DEV: update for mpr
1 parent 95791ae commit 4c16737

File tree

39 files changed

+10517
-100026
lines changed

39 files changed

+10517
-100026
lines changed

dist/ejs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ MAIN(ejsMain, int argc, char **argv, char **envp)
8686
optimizeLevel = 9;
8787
strict = 0;
8888
logSpec = 0;
89-
traceSpec = 0;
89+
traceSpec = "stderr:0";
9090

9191
app->files = mprCreateList(-1, 0);
9292
app->iterations = 1;

dist/ejsLib.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36330,6 +36330,7 @@ static int getNumOption(Ejs *ejs, EjsObj *options, cchar *field)
3633036330

3633136331
static void setupTrace(Ejs *ejs, HttpTrace *trace, EjsObj *options)
3633236332
{
36333+
httpSetTraceLevel(getNumOption(ejs, options, "level"));
3633336334
httpSetTraceEventLevel(trace, "connection", getNumOption(ejs, options, "connection"));
3633436335
httpSetTraceEventLevel(trace, "error", getNumOption(ejs, options, "error"));
3633536336
httpSetTraceEventLevel(trace, "inform", getNumOption(ejs, options, "info"));
@@ -36441,7 +36442,7 @@ static EjsObj *http_set_verify(Ejs *ejs, EjsHttp *hp, int argc, EjsObj **argv)
3644136442
hp->ssl = mprCreateSsl(0);
3644236443
}
3644336444
mprVerifySslIssuer(hp->ssl, verify);
36444-
mprVerifySslPeer(hp->ssl, verify);
36445+
mprVerifySslPeer(hp->ssl, verify ? "required": "none");
3644536446
return 0;
3644636447
}
3644736448

@@ -51476,7 +51477,7 @@ static EjsWebSocket *wsConstructor(Ejs *ejs, EjsWebSocket *ws, int argc, EjsObj
5147651477
if (sstarts(ws->uri, "wss")) {
5147751478
ws->ssl = mprCreateSsl(0);
5147851479
mprVerifySslIssuer(ws->ssl, verify);
51479-
mprVerifySslPeer(ws->ssl, verify);
51480+
mprVerifySslPeer(ws->ssl, verify ? "optional" : "none");
5148051481
#if FUTURE
5148151482
if (!hp->caFile) {
5148251483
hp->caFile = mprJoinPath(mprGetAppDir(), "http-ca.crt");

doc/.expansive-lastgen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sun Jul 23 2023 09:33:18 GMT1000 (AEST)
1+
Wed Oct 18 2023 17:24:14 GMT1100 (AEDT)

doc/api/ejscript.html

Lines changed: 361 additions & 361 deletions
Large diffs are not rendered by default.

doc/api/ejscript.tags

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

doc/contents/index.html.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class="ui left floated image"
88
alt="ejs"
99
/>
10-
<h2>Ejscript is archived and no longer maintained</h2>
10+
<h2>Ejscript is archived and no longer supported or maintained</h2>
1111

1212
<p>
1313
Ejscript is an integrated

doc/dist/css/all.css

Lines changed: 0 additions & 347 deletions
This file was deleted.

doc/dist/css/api.css

Lines changed: 0 additions & 137 deletions
This file was deleted.

doc/dist/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<h1>Embedthis Ejscript&trade;</h1>
170170
<div class="floated">
171171
<img src="images/ejscript-icon-128.png" class="ui left floated image" alt="ejs">
172-
<h2>Ejscript is archived and no longer maintained</h2>
172+
<h2>Ejscript is archived and no longer supported or maintained</h2>
173173

174174
<p>
175175
Ejscript is an integrated

doc/dist/lib/jquery/jquery.min.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)