Loading support/ab.c +9 −18 Original line number Diff line number Diff line Loading @@ -1928,40 +1928,31 @@ static int parse_url(char *url) static int open_postfile(const char *pfile) { apr_file_t *postfd = NULL; apr_file_t *postfd; apr_finfo_t finfo; apr_fileperms_t mode = APR_OS_DEFAULT; apr_size_t length; apr_status_t rv; char errmsg[120]; rv = apr_file_open(&postfd, pfile, APR_READ, mode, cntxt); rv = apr_file_open(&postfd, pfile, APR_READ, APR_OS_DEFAULT, cntxt); if (rv != APR_SUCCESS) { printf("Invalid postfile name (%s): %s\n", pfile, fprintf(stderr, "ab: Could not open POST data file (%s): %s\n", pfile, apr_strerror(rv, errmsg, sizeof errmsg)); return rv; } apr_file_info_get(&finfo, APR_FINFO_NORM, postfd); postlen = (apr_size_t)finfo.size; postdata = (char *) malloc(postlen); postdata = malloc(postlen); if (!postdata) { printf("Can\'t alloc postfile buffer\n"); fprintf(stderr, "ab: Could not allocate POST data buffer\n"); return APR_ENOMEM; } length = postlen; rv = apr_file_read(postfd, postdata, &length); rv = apr_file_read_full(postfd, postdata, postlen, NULL); if (rv != APR_SUCCESS) { printf("error reading postfile: %s\n", fprintf(stderr, "ab: Could not read POST data file: %s\n", apr_strerror(rv, errmsg, sizeof errmsg)); return rv; } if (length != postlen) { printf("error reading postfile: read only %" APR_SIZE_T_FMT " bytes", length); return APR_EINVAL; } apr_file_close(postfd); return 0; } Loading Loading
support/ab.c +9 −18 Original line number Diff line number Diff line Loading @@ -1928,40 +1928,31 @@ static int parse_url(char *url) static int open_postfile(const char *pfile) { apr_file_t *postfd = NULL; apr_file_t *postfd; apr_finfo_t finfo; apr_fileperms_t mode = APR_OS_DEFAULT; apr_size_t length; apr_status_t rv; char errmsg[120]; rv = apr_file_open(&postfd, pfile, APR_READ, mode, cntxt); rv = apr_file_open(&postfd, pfile, APR_READ, APR_OS_DEFAULT, cntxt); if (rv != APR_SUCCESS) { printf("Invalid postfile name (%s): %s\n", pfile, fprintf(stderr, "ab: Could not open POST data file (%s): %s\n", pfile, apr_strerror(rv, errmsg, sizeof errmsg)); return rv; } apr_file_info_get(&finfo, APR_FINFO_NORM, postfd); postlen = (apr_size_t)finfo.size; postdata = (char *) malloc(postlen); postdata = malloc(postlen); if (!postdata) { printf("Can\'t alloc postfile buffer\n"); fprintf(stderr, "ab: Could not allocate POST data buffer\n"); return APR_ENOMEM; } length = postlen; rv = apr_file_read(postfd, postdata, &length); rv = apr_file_read_full(postfd, postdata, postlen, NULL); if (rv != APR_SUCCESS) { printf("error reading postfile: %s\n", fprintf(stderr, "ab: Could not read POST data file: %s\n", apr_strerror(rv, errmsg, sizeof errmsg)); return rv; } if (length != postlen) { printf("error reading postfile: read only %" APR_SIZE_T_FMT " bytes", length); return APR_EINVAL; } apr_file_close(postfd); return 0; } Loading