DEV: update paks

Author: Michael O'Brien

.gitignore

@@ -3,3 +3,4 @@ samples/**/main
 src/compiler/test/bugs/
 ejsZlib.miniz
 /start.me
+*.sdb

Makefile

@@ -37,7 +37,7 @@ else
 endif
 
 BIN 	:= $(OS)-$(ARCH)-$(PROFILE)/bin
-PATH	:= $(BIN):$(PATH)
+PATH    := $(PWD)/build/$(BIN):$(PATH)
 
 .EXPORT_ALL_VARIABLES:
 

doc/ejscript.dox

@@ -182,15 +182,17 @@ TAB_SIZE               = 4
 # You can put \n's in the value part of an alias to insert newlines.
 
 ALIASES                = "reminder=\xrefitem reminders \"Reminder\" \"Reminders\"" \
-                         "overview=\par \b Overview:\n" \
-                         "scope=\par \b Scope:\n" \
-                         "library=\par \b Library:\n" \
-                         "options=\par \b Options:\n" \
-                         "description=\par \b Description:\n" \
-                         "elements=\par \b Elements:\n" \
-                         "example=\par \b Example:\n" \
-                         "stability=\par \b API Stability:\n"
-
+                         "overview=\par \b Overview:^^" \
+                         "scope=\par \b Scope:^^" \
+                         "library=\par \b Library:^^" \
+                         "options=\par \b Options:^^" \
+                         "description=\par \b Description:^^" \
+                         "elements=\par \b Elements:^^" \
+                         "stability=\par \b API Stability:^^" \
+                         "example=\par \b Example:^^" \
+                         "examples=\par \b Examples:^^" \
+                         "l=\link" \
+                         "el=\endlink"
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
 # sources only. Doxygen will then generate output that is more tailored for C. 

paks/assist/docker-deploy-elb

@@ -17,7 +17,11 @@ DPORT=2375
 #done
 #eval $(../paks/assist/json2env ${files})
 
-VERSION=$(pak --dir .. edit version)
+if [ -f pak.json ] ; then
+    VERSION=$(pak --dir . edit version)
+else
+    VERSION=$(pak --dir .. edit version)
+fi
 
 while [[ $# -gt 0 ]] ; do
     arg="$1"
@@ -59,7 +63,7 @@ done
 IMAGE="${1}"
 NAME="${IMAGE}"
 if [ "${IMAGE}" = "" -o "${AWS_DEFAULT_REGION}" = "" ] ; then
-    echo "usage: docker-publish [--primary] [--aws-profile profile] [--region region] image"
+    echo "usage: docker-deploy [--aws-profile profile] [--region region] [--proxy proxy] [--group group] [--deploy cmd] [--validate cmd] image"
     exit 255
 fi
 export AWS_PROFILE AWS_DEFAULT_REGION

paks/assist/docker-publish

@@ -5,7 +5,12 @@
 #   usage: docker-publish [--primary] [--aws-profile profile] [--region region] image
 #
 
-VERSION=$(pak --dir .. edit version)
+if [ -f pak.json ] ; then
+    VERSION=$(pak --dir . edit version)
+else
+    VERSION=$(pak --dir .. edit version)
+fi
+
 
 while [[ $# -gt 0 ]] ; do
     arg="$1"

paks/http/dist/httpLib.c

@@ -5887,7 +5887,7 @@ static void connTimeout(HttpConn *conn, MprEvent *mprEvent)
                 httpTrace(conn, event, "error", "msg:'%s'", msg);
             }
         } else {
-            httpError(conn, HTTP_CODE_REQUEST_TIMEOUT, "%s", msg);
+            httpError(conn, HTTP_CODE_REQUEST_TIMEOUT | HTTP_CLOSE, "%s", msg);
         }
     }
     if (httpClientConn(conn)) {
@@ -6145,15 +6145,6 @@ PUBLIC void httpIO(HttpConn *conn, int eventMask)
     assert(conn->tx);
     assert(conn->rx);
 
-#if DEPRECATE
-    /* Just IO state asserting */
-    if (conn->io) {
-        assert(!conn->io);
-        return;
-    }
-    conn->io = 1;
-#endif
-
     if ((eventMask & MPR_WRITABLE) && conn->connectorq) {
         httpResumeQueue(conn->connectorq);
     }
@@ -6197,6 +6188,7 @@ PUBLIC void httpIO(HttpConn *conn, int eventMask)
         }
         httpTrace(conn, "connection.close", "context", "msg:'%s'", conn->errorMsg);
         httpDestroyConn(conn);
+
     } else if (!mprIsSocketEof(conn->sock) && conn->async && !conn->delay) {
         httpEnableConnEvents(conn);
     }
@@ -16167,6 +16159,7 @@ static bool parseIncoming(HttpConn *conn)
     /*
         Don't start processing until all the headers have been received (delimited by two blank lines)
      */
+    start = mprGetBufStart(packet->content);
     if ((end = sncontains(start, "\r\n\r\n", len)) == 0 && (end = sncontains(start, "\n\n", len)) == 0) {
         if (len >= limits->headerSize) {
             httpLimitError(conn, HTTP_ABORT | HTTP_CODE_REQUEST_TOO_LARGE,

paks/http/pak.json

@@ -30,11 +30,11 @@
         }
     ],
     "dependencies": {
-        "certs": "~0.1",
+        "certs": "~1",
         "mpr": "~8",
         "mpr-mbedtls": "~2",
-        "osdep": "~1.0",
-        "pcre": "~1.0",
+        "osdep": "~1",
+        "pcre": "~1",
         "ssl": "~1"
     },
     "optionalDependencies": {

paks/mbedtls/dist/mbedtls.h

@@ -1199,7 +1199,7 @@
  *
  * Comment this macro to disable 1/n-1 record splitting.
  */
-#define MBEDTLS_SSL_CBC_RECORD_SPLITTING
+// #define MBEDTLS_SSL_CBC_RECORD_SPLITTING
 
 /**
  * \def MBEDTLS_SSL_RENEGOTIATION
@@ -1274,7 +1274,7 @@
  *
  * Comment this macro to disable support for TLS 1.0
  */
-#define MBEDTLS_SSL_PROTO_TLS1
+// #define MBEDTLS_SSL_PROTO_TLS1
 
 /**
  * \def MBEDTLS_SSL_PROTO_TLS1_1

paks/me-win/pak.json

@@ -2,7 +2,7 @@
     "name": "me-win",
     "description": "Windows build support",
     "title": "Windows Build Support",
-    "version": "0.1.0",
+    "version": "1.0.0",
     "keywords": [
         "me"
     ],