Skip to content

Commit dfab97f

Browse files
author
Michael O'Brien
committed
DEV: update paks and regen
1 parent 96aabb4 commit dfab97f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+92590
-163086
lines changed

.gitignore

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,85 @@ src/compiler/test/bugs/
44
ejsZlib.miniz
55
/start.me
66
*.sdb
7+
*.cgi
8+
test/web/huge.txt
9+
test/web/tmp/
10+
test/app/
11+
test/cache/
12+
test/cgi-bin/*cgi*
13+
test/cgi-bin/testScript
14+
/test/esp/html-mvc/cache
15+
test/regress/tcp
16+
test/cgi-bin/.prepared
17+
test/future.json
18+
test/test.dat
19+
test/tmp/test.dat
20+
test/tmp/*
21+
src/server/certs
22+
.port.log
23+
*.guid
24+
test/exploits/
25+
start.me
26+
testme/
27+
projects/*/*.guid
28+
projects/.*.guid
29+
projects/*-macosx-mine*
30+
/start.me
31+
test/cgi-bin/.prepared
32+
test/future.json
33+
test/test.dat
34+
/projects/*mine*
35+
/projects/*ossl*
36+
/projects/.vs
37+
/projects/*yours*
38+
/test/.test-prepared
39+
/cache/
40+
/build
41+
/projects/setenv.bat
42+
/projects/appweb-core*
43+
XCBuildData/
44+
app-macosx-debug.xcodeproj
45+
Debug/
46+
cache/
47+
.local.mk
48+
src/utils/fcgi
49+
test/web/big*.txt
50+
test/web/huge*.txt
51+
test/web/*K.txt
52+
test/web/*M.txt
53+
test/fast-bin
54+
test/trace.log*
55+
test/error.log*
56+
test/web/*K.txt
57+
test/proxy.err
58+
test/proxy.log
59+
test/j*.conf
60+
php.log
61+
t.es
62+
.cdrc
63+
.profile
64+
*.dmp
65+
src/server/web/1*.txt
66+
test/debug.conf
67+
test/web/many
68+
certs/
69+
**/*.guid
70+
.DS_Store
71+
.cdrc
72+
.expansive-lastgen
73+
.install-certs-modified
74+
.profile
75+
.tags
76+
build/
77+
projects/*-mine*
78+
projecs/*.sdf
79+
projecs/*.sln
80+
projecs/*.suo
81+
projects/*/project.xcworkspace/
82+
projects/*/xcuserdata/
83+
*.swp
84+
.tags*
85+
.version
86+
*.mod
87+
*.log
88+
*.tdat

LICENSE.md

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,64 @@
1-
Embedthis Ejscript Licenses
2-
===
1+
# Embedthis Ejscript Licenses
32

43
This software is distributed under commercial and GPL open source licenses.
54
The GPL License does not generally permit incorporating this software into
65
non-open source programs. Commercial licenses for this software and support
76
services are available from Embedthis Software.
87

9-
* [GPL License](http://www.gnu.org/licenses/gpl-2.0.html)
10-
* [Embedthis Commercial License](https://embedthis.com/licensing/)
8+
- [GPL License](http://www.gnu.org/licenses/gpl-2.0.html)
9+
- [Embedthis Commercial License](https://www.embedthis.com/licensing/)
1110

12-
Third Party Licenses
13-
---
11+
## Third Party Licenses
1412

1513
The Software contains third party software under the agreements that follow.
1614

17-
### Dtoa License
15+
### Dtoa License
1816

1917
The Dtoa module is used in Ejscript.
2018

21-
Permission to use, copy, modify, and distribute this software for any purpose
22-
without fee is hereby granted, provided that this entire notice is included
23-
in all copies of any software which is or includes a copy or modification of
24-
this software and in all copies of the supporting documentation for such
19+
Permission to use, copy, modify, and distribute this software for any purpose
20+
without fee is hereby granted, provided that this entire notice is included
21+
in all copies of any software which is or includes a copy or modification of
22+
this software and in all copies of the supporting documentation for such
2523
software.
2624

27-
THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
25+
THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
2826
WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY REPRESENTATION
29-
OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
27+
OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
3028
FITNESS FOR ANY PARTICULAR PURPOSE.
3129

32-
3330
### JQuery License
3431

3532
[JQuery](http://jquery.org/license/) - [MIT](http://opensource.org/licenses/MIT)
3633

37-
3834
### MbedTLS License
3935

4036
MbedTLS - [Apache](http://www.apache.org/licenses/LICENSE-2.0)
4137

42-
4338
### Perl Regular Expressions License
4439

4540
[PCRE License - BSD 2 Clause](http://opensource.org/licenses/BSD-2-Clause)
4641

47-
4842
### RSA MD5 License
4943

50-
License to copy and use this software is granted provided that it is identified
51-
as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material
52-
mentioning or referencing this software or this function. License is also
53-
granted to make and use derivative works provided that such works are
54-
identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest
44+
License to copy and use this software is granted provided that it is identified
45+
as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material
46+
mentioning or referencing this software or this function. License is also
47+
granted to make and use derivative works provided that such works are
48+
identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest
5549
Algorithm" in all material mentioning or referencing the derived work. RSA Data
56-
Security, Inc. makes no representations concerning either the merchantability
57-
of this software or the suitability of this software for any particular
58-
purpose. It is provided "as is" without express or implied warranty of any
59-
kind. These notices must be retained in any copies of any part of this
60-
documentation and/or software.
61-
50+
Security, Inc. makes no representations concerning either the merchantability
51+
of this software or the suitability of this software for any particular
52+
purpose. It is provided "as is" without express or implied warranty of any
53+
kind. These notices must be retained in any copies of any part of this
54+
documentation and/or software.
6255

6356
### Zlib License
6457

65-
* [ZLIB License (MIT style)](http://www.zlib.net/zlib_license.html)
58+
- [ZLIB License (MIT style)](http://www.zlib.net/zlib_license.html)
6659

60+
## Trademarks and Copyrights
6761

68-
Trademarks and Copyrights
69-
---
7062
Copyright (c) Embedthis Software. All Rights Reserved.
7163
Embedthis and Embedthis Ejscript are trademarks of Embedthis Software, LLC.
7264
Other brands and their products are trademarks of their respective holders.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(ARCH),)
2424
ARCH?=x86
2525
endif
2626
else
27-
ARCH:= $(shell uname -m | sed 's/i.86/x86/;s/x86_64/x64/;s/arm.*/arm/;s/mips.*/mips/')
27+
ARCH:= $(shell uname -m | sed 's/i.86/x86/;s/x86_64/x64/;s/mips.*/mips/')
2828
endif
2929
endif
3030

dist/ejs.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4078,7 +4078,6 @@ PUBLIC EjsNamespace *ejsCreateReservedNamespace(Ejs *ejs, EjsName *typeName, Ejs
40784078
@param block Block to modify
40794079
@param typeName Type on which to base the formatted namespace name
40804080
@param name Formatted base name for the namespace
4081-
@param block Block to modify
40824081
@return A new namespace object
40834082
@ingroup EjsNamespace
40844083
*/
@@ -4606,7 +4605,6 @@ PUBLIC void ejsLoadXMLString(Ejs *ejs, EjsXML *xml, EjsString *xmlString);
46064605
@param ejs Ejs reference returned from #ejsCreateVM
46074606
@param xml XML node to hold the parsed XML data.
46084607
@param xmlString String containing XML data to parse
4609-
@return A new XML object
46104608
@ingroup EjsXML
46114609
*/
46124610
PUBLIC void ejsLoadXMLAsc(Ejs *ejs, EjsXML *xml, cchar *xmlString);
@@ -4786,7 +4784,6 @@ PUBLIC int ejsBindAccess(Ejs *ejs, EjsAny *obj, int slotNum, void *getter, void
47864784
@param ejs Interpreter instance returned from #ejsCreateVM
47874785
@param type Type to modify
47884786
@param constructor Native C constructor function to bind.
4789-
@return Zero if successful, otherwise a negative MPR error code.
47904787
@ingroup EjsType
47914788
*/
47924789
PUBLIC void ejsBindConstructor(Ejs *ejs, EjsType *type, void *constructor);

dist/ejsLib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28882,7 +28882,7 @@ static EjsAny *invokeBooleanOperator(Ejs *ejs, EjsBoolean *lhs, int opcode, EjsB
2888228882
return ejsCreateBoolean(ejs, lhs->value / rhs->value);
2888328883

2888428884
case EJS_OP_MUL:
28885-
return ejsCreateBoolean(ejs, lhs->value * rhs->value);
28885+
return ejsCreateBoolean(ejs, (lhs->value * rhs->value) == 0 ? 0 : 1);
2888628886

2888728887
case EJS_OP_OR:
2888828888
return ejsCreateBoolean(ejs, lhs->value | rhs->value);
@@ -55998,7 +55998,7 @@ static EjsVoid *hs_listen(Ejs *ejs, EjsHttpServer *sp, int argc, EjsObj **argv)
5599855998
return 0;
5599955999
}
5600056000
sp->endpoint = endpoint;
56001-
host = httpCreateHost(NULL);
56001+
host = httpCreateHost();
5600256002
httpSetHostName(host, sfmt("%s:%d", sp->ip, sp->port));
5600356003
route = httpCreateConfiguredRoute(host, 1);
5600456004

installs/linux/deb.bin/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Description: Embedthis Ejscript
1313
Ejscript is a powerful server-side JavaScript language and web framework suitable for dynamic web applications.
1414
.
1515
more information about Ejscript can be found at:
16-
<URL:https://embedthis.com/ejs>
16+
<URL:https://www.embedthis.com/ejs>

installs/macosx/conclusion.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
\f1\b0\fs24 \
2525
\
2626

27-
\f0\fs26 https://embedthis.com/ejscript/doc/\
27+
\f0\fs26 https://www.embedthis.com/ejscript/doc/\
2828

2929
\f1\fs24 \
3030
}

installs/macosx/license.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This software is licensed according to the provisions of GNU GENERAL PUBLIC LICE
1111
\
1212
Commercial license are also available for those who require them. The Embedthis Commercial License, allows you to provide commercial software licenses for products containing Embedthis software. This is for individuals or organizations that do not want to release their source code as open source / free software as governed by the GPL license below. For more information on licensing, please see:\
1313
\
14-
https://embedthis.com//licensing/index.html\
14+
https://www.embedthis.com//licensing/index.html\
1515
\
1616
Some components of the software are licensed from third parties. See the end of this document for a list of licensed third party software.\
1717
\

installs/macosx/readme.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This document describes the installation procedure for the binary Ejscript packa
1414
\
1515
You can read the documentation for the latest release online at:\
1616
\
17-
https://embedthis.com/ejscript/doc/index.html\
17+
https://www.embedthis.com/ejscript/doc/index.html\
1818
\
1919
This software is copyrighted and distributed under license. Please read the license.rtf for details.\
2020
\

installs/windows/LICENSE.TXT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This software is licensed according to the provisions of GNU GENERAL PUBLIC LICE
44

55
Commercial license are also available for those who require them. The Embedthis Commercial License, allows you to provide commercial software licenses for products containing Embedthis software. This is for individuals or organizations that do not want to release their source code as open source / free software as governed by the GPL license below. For more information on licensing, please see:
66

7-
https://embedthis.com/licensing/index.html
7+
https://www.embedthis.com/licensing/index.html
88

99
Some components of the sofware are licensed from third parties. See the end of this document for a list of licensed third party software.
1010

0 commit comments

Comments
 (0)