X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=mod_proxy_fdpass2.c;h=1368d9d72a91ce69222d20a756aaeaa70664ed25;hb=b33c4716f07e080a80a6d63bc8031efe36a970e8;hp=373c62b5306979069825a40698e3082bc3e5930d;hpb=d2d69719ae43c40a3924efcc1ec3d8afb99b323a;p=mod-proxy-fdpass.git

diff --git a/mod_proxy_fdpass2.c b/mod_proxy_fdpass2.c
index 373c62b..1368d9d 100644
--- a/mod_proxy_fdpass2.c
+++ b/mod_proxy_fdpass2.c
@@ -42,7 +42,8 @@ module AP_MODULE_DECLARE_DATA proxy_fdpass2_module;
 
 static int proxy_fdpass2_canon(request_rec *r, char *url)
 {
-    const char *path, sfx[16];
+    const char *path;
+    char sfx[16];
 
 #if ALTOUT_DEBUG > 1
     {
@@ -267,239 +268,6 @@ static apr_status_t send_socket(apr_pool_t *p,
         return errno;
     }
 
-
-    return APR_SUCCESS;
-}
-
-static int headers_builder(void *rec, const char *key, const char *value)
-{
-    char *s;
-
-    s = (char *)rec;
-
-#if ALTOUT_DEBUG > 1
-    {
-        int mop_fd;
-        char mop_bf[512];
-
-        mop_fd = open(ALTOUT_DBG_FILE, O_WRONLY | O_APPEND | O_CREAT, 0644);
-        sprintf(mop_bf, "HEADERS_BUILDER: [%s:%s]\n", key, value);
-        write(mop_fd, mop_bf, strlen(mop_bf));
-        close(mop_fd);
-    }
-#endif
-
-    // TODO: verify length
-    // sprintf(s, "%s%s:%s\n", s, key, value);
-    strcat(s, key);
-    strcat(s, ":");
-    strcat(s, value);
-    strcat(s, "\n");
-}
-
-#define CTRL_BUFF_MAX_SZ (8*1024)
-
-#define DEFAULT_ENCTYPE "application/x-www-form-urlencoded"
-
-int util_read(request_rec *r, const char **rbuf)
-{
-    int rc;
-
-    if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK) {
-        return rc;
-    }
-
-    if (ap_should_client_block(r)) {
-        char argsbuffer[HUGE_STRING_LEN];
-        int rsize, len_read, rpos=0;
-        long length = r->remaining;
-        *rbuf = (char *)apr_pcalloc(r->pool, length +1);
-        if ((len_read = ap_get_client_block(r, argsbuffer,
-                                            sizeof(argsbuffer))) > 0) {
-            if ((rpos + len_read) > length) {
-                rsize = length - rpos;
-            } else {
-                rsize = len_read;
-            }
-
-            memcpy((char *)*rbuf + rpos, argsbuffer, rsize);
-            rpos += rsize;
-        }
-
-    }
-
-    return rc;
-}
-
-int read_post(request_rec *r, const char **data)
-{
-    const char *type;
-    char *p, s_type[256];
-    int rc = OK;
-
-    s_type[255] = '\0';
-close(mop_fd);
-#endif
-
-    if (rv == -1) {
-        return errno;
-    }
-
-
-    return APR_SUCCESS;
-}
-
-static int headers_builder(void *rec, const char *key, const char *value)
-{
-    char *s;
-
-    s = (char *)rec;
-
-#if ALTOUT_DEBUG > 1
-    {
-        int mop_fd;
-        char mop_bf[512];
-
-        mop_fd = open(ALTOUT_DBG_FILE, O_WRONLY | O_APPEND | O_CREAT, 0644);
-        sprintf(mop_bf, "HEADERS_BUILDER: [%s:%s]\n", key, value);
-        write(mop_fd, mop_bf, strlen(mop_bf));
-        close(mop_fd);
-    }
-#endif
-
-    // TODO: verify length
-    // sprintf(s, "%s%s:%s\n", s, key, value);
-    strcat(s, key);
-    strcat(s, ":");
-    strcat(s, value);
-    strcat(s, "\n");
-}
-
-#define CTRL_BUFF_MAX_SZ (8*1024)
-
-#define DEFAULT_ENCTYPE "application/x-www-form-urlencoded"
-
-int util_read(request_rec *r, const char **rbuf)
-{
-    int rc;
-
-    if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK) {
-        return rc;
-    }
-
-    if (ap_should_client_block(r)) {
-        char argsbuffer[HUGE_STRING_LEN];
-        int rsize, len_read, rpos=0;
-        long length = r->remaining;
-        *rbuf = (char *)apr_pcalloc(r->pool, length +1);
-        if ((len_read = ap_get_client_block(r, argsbuffer,
-                                            sizeof(argsbuffer))) > 0) {
-            if ((rpos + len_read) > length) {
-                rsize = length - rpos;
-            } else {
-                rsize = len_read;
-            }
-
-            memcpy((char *)*rbuf + rpos, argsbuffer, rsize);
-            rpos += rsize;
-        }
-
-    }
-
-    return rc;
-}
-
-int read_post(request_rec *r, const char **data)
-{
-    const char *type;
-    char *p, s_type[256];
-    int rc = OK;
-
-    s_type[255] = '\0';
-close(mop_fd);
-#endif
-
-    if (rv == -1) {
-        return errno;
-    }
-
-    return APR_SUCCESS;
-}
-
-static int headers_builder(void *rec, const char *key, const char *value)
-{
-    char *s;
-
-    s = (char *)rec;
-
-#if ALTOUT_DEBUG > 1
-    {
-        int mop_fd;
-        char mop_bf[512];
-
-        mop_fd = open(ALTOUT_DBG_FILE, O_WRONLY | O_APPEND | O_CREAT, 0644);
-        sprintf(mop_bf, "HEADERS_BUILDER: [%s:%s]\n", key, value);
-        write(mop_fd, mop_bf, strlen(mop_bf));
-        close(mop_fd);
-    }
-#endif
-
-    // TODO: verify length
-    // sprintf(s, "%s%s:%s\n", s, key, value);
-    strcat(s, key);
-    strcat(s, ":");
-    strcat(s, value);
-    strcat(s, "\n");
-}
-
-#define CTRL_BUFF_MAX_SZ (8*1024)
-
-#define DEFAULT_ENCTYPE "application/x-www-form-urlencoded"
-
-int util_read(request_rec *r, const char **rbuf)
-{
-    int rc;
-
-    if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK) {
-        return rc;
-    }
-
-    if (ap_should_client_block(r)) {
-        char argsbuffer[HUGE_STRING_LEN];
-        int rsize, len_read, rpos=0;
-        long length = r->remaining;
-        *rbuf = (char *)apr_pcalloc(r->pool, length +1);
-        if ((len_read = ap_get_client_block(r, argsbuffer,
-                                            sizeof(argsbuffer))) > 0) {
-            if ((rpos + len_read) > length) {
-                rsize = length - rpos;
-            } else {
-                rsize = len_read;
-            }
-
-            memcpy((char *)*rbuf + rpos, argsbuffer, rsize);
-            rpos += rsize;
-        }
-
-    }
-
-    return rc;
-}
-
-int read_post(request_rec *r, const char **data)
-{
-    const char *type;
-    char *p, s_type[256];
-    int rc = OK;
-
-    s_type[255] = '\0';
-close(mop_fd);
-#endif
-
-    if (rv == -1) {
-        return errno;
-    }
-
     return APR_SUCCESS;
 }
 
@@ -646,9 +414,9 @@ static int proxy_fdpass2_handler(request_rec *r, proxy_worker *worker,
     rv = get_socket_from_path(r, r->pool, url, &sock);
 
 #if ALTOUT_DEBUG > 0
-    time_t t_cur;
+    long long t_cur;
     int t_rnd;
-    t_cur = time();
+    t_cur = (long long)time();
     t_rnd = rand();
 #endif
 
@@ -658,7 +426,7 @@ static int proxy_fdpass2_handler(request_rec *r, proxy_worker *worker,
         char mop_bf[512];
 
         mop_fd = open(ALTOUT_DBG_FILE, O_WRONLY | O_APPEND | O_CREAT, 0644);
-        sprintf(mop_bf, "%d: (%d) proxy_fdpass2_handler: start\n", t_cur, t_rnd);
+        sprintf(mop_bf, "%lld: (%d) proxy_fdpass2_handler: start\n", t_cur, t_rnd);
         write(mop_fd, mop_bf, strlen(mop_bf));
         close(mop_fd);
     }
@@ -824,7 +592,7 @@ static int proxy_fdpass2_handler(request_rec *r, proxy_worker *worker,
         char mop_bf[512];
 
         mop_fd = open(ALTOUT_DBG_FILE, O_WRONLY | O_APPEND | O_CREAT, 0644);
-        sprintf(mop_bf, "%d: (%d) proxy_fdpass2_handler: end\n", t_cur, t_rnd);
+        sprintf(mop_bf, "%lld: (%d) proxy_fdpass2_handler: end\n", t_cur, t_rnd);
         write(mop_fd, mop_bf, strlen(mop_bf));
         close(mop_fd);
     }