From ebf4de93be248632c480c6a7d76aba1633344802 Mon Sep 17 00:00:00 2001 From: Embedthis Software Date: Tue, 10 May 2016 10:04:47 -0700 Subject: [PATCH] DEV: update openssl dep version --- dist/appweb.h | 11 -------- dist/appwebLib.c | 48 ++--------------------------------- package.json | 2 +- paks/mpr-openssl/package.json | 2 +- 4 files changed, 4 insertions(+), 59 deletions(-) diff --git a/dist/appweb.h b/dist/appweb.h index 4ef269433..506b8cc89 100644 --- a/dist/appweb.h +++ b/dist/appweb.h @@ -276,22 +276,11 @@ PUBLIC int httpEspInit(Http *http, MprModule *mp); #endif /* _h_APPWEB */ /* - @copy default - Copyright (c) Embedthis Software. All Rights Reserved. - This software is distributed under commercial and open source licenses. You may use the Embedthis Open Source license or you may acquire a commercial license from Embedthis Software. You agree to be fully bound by the terms of either license. Consult the LICENSE.md distributed with this software for full details and other copyrights. - - Local variables: - tab-width: 4 - c-basic-offset: 4 - End: - vim: sw=4 ts=4 expandtab - - @end */ diff --git a/dist/appwebLib.c b/dist/appwebLib.c index 6efb4b482..6eca3ed1a 100644 --- a/dist/appwebLib.c +++ b/dist/appwebLib.c @@ -3600,23 +3600,12 @@ PUBLIC int maLoadModule(cchar *name, cchar *libname) } /* - @copy default - Copyright (c) Embedthis Software. All Rights Reserved. - This software is distributed under commercial and open source licenses. You may use the Embedthis Open Source license or you may acquire a commercial license from Embedthis Software. You agree to be fully bound by the terms of either license. Consult the LICENSE.md distributed with this software for full details and other copyrights. - - Local variables: - tab-width: 4 - c-basic-offset: 4 - End: - vim: sw=4 ts=4 expandtab - - @end */ @@ -3698,23 +3687,12 @@ PUBLIC int maRunSimpleWebServer(cchar *ip, int port, cchar *home, cchar *documen /* - @copy default - Copyright (c) Embedthis Software. All Rights Reserved. - This software is distributed under commercial and open source licenses. - You may use the Embedthis Open Source license or you may acquire a + You may use the Embedthis Open Source license or you may acquire a commercial license from Embedthis Software. You agree to be fully bound by the terms of either license. Consult the LICENSE.md distributed with this software for full details and other copyrights. - - Local variables: - tab-width: 4 - c-basic-offset: 4 - End: - vim: sw=4 ts=4 expandtab - - @end */ @@ -4613,23 +4591,12 @@ PUBLIC int httpCgiInit(Http *http, MprModule *module) #endif /* ME_COM_CGI */ /* - @copy default - Copyright (c) Embedthis Software. All Rights Reserved. - This software is distributed under commercial and open source licenses. - You may use the Embedthis Open Source license or you may acquire a + You may use the Embedthis Open Source license or you may acquire a commercial license from Embedthis Software. You agree to be fully bound by the terms of either license. Consult the LICENSE.md distributed with this software for full details and other copyrights. - - Local variables: - tab-width: 4 - c-basic-offset: 4 - End: - vim: sw=4 ts=4 expandtab - - @end */ @@ -4741,23 +4708,12 @@ PUBLIC int httpEspInit(Http *http, MprModule *module) #endif /* ME_COM_ESP */ /* - @copy default - Copyright (c) Embedthis Software. All Rights Reserved. - This software is distributed under commercial and open source licenses. You may use the Embedthis Open Source license or you may acquire a commercial license from Embedthis Software. You agree to be fully bound by the terms of either license. Consult the LICENSE.md distributed with this software for full details and other copyrights. - - Local variables: - tab-width: 4 - c-basic-offset: 4 - End: - vim: sw=4 ts=4 expandtab - - @end */ #endif /* ME_COM_APPWEB */ diff --git a/package.json b/package.json index a5830478c..ca046582e 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "esp": "~6.2", "mpr-matrixssl": "~0.3", "mpr-mbedtls": "~0.5", - "mpr-openssl": "~0.4", + "mpr-openssl": "~0.5", "sqlite": "~1.0" }, "devDependencies": { diff --git a/paks/mpr-openssl/package.json b/paks/mpr-openssl/package.json index e8e53a1d8..0694c3a05 100644 --- a/paks/mpr-openssl/package.json +++ b/paks/mpr-openssl/package.json @@ -2,7 +2,7 @@ "name": "mpr-openssl", "title": "OpenSSL support", "description": "OpenSSL Support for the MPR", - "version": "0.4.3", + "version": "0.5.0", "keywords": [ "me", "ssl",