Release 0.6.1.

Author: jmjoy

.github/workflows/rust.yml

@@ -2,7 +2,7 @@ name: Rust
 
 on:
  push:
- branches: [ master, tokio-1 ]
+ branches: [ master, develop ]
  pull_request:
  branches: [ "**" ]
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fastcgi-client"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["jmjoy <918734043@qq.com>"]
 edition = "2018"
 description = "Fastcgi client implemented for Rust."

benches/async_client_bench.rs

@@ -0,0 +1,72 @@
+#![feature(test)]
+
+extern crate test;
+
+use fastcgi_client::{request::Request, Client, Params};
+use std::env::current_dir;
+use test::Bencher;
+use tokio::{
+ io::{self, AsyncRead, AsyncWrite},
+ net::TcpStream,
+};
+
+mod common;
+
+async fn test_client<S: AsyncRead + AsyncWrite + Send + Sync + Unpin>(client: &mut Client<S>) {
+ let document_root = current_dir().unwrap().join("tests").join("php");
+ let document_root = document_root.to_str().unwrap();
+ let script_name = current_dir()
+ .unwrap()
+ .join("tests")
+ .join("php")
+ .join("index.php");
+ let script_name = script_name.to_str().unwrap();
+
+ let params = Params::default()
+ .set_request_method("GET")
+ .set_document_root(document_root)
+ .set_script_name("/index.php")
+ .set_script_filename(script_name)
+ .set_request_uri("/index.php")
+ .set_document_uri("/index.php")
+ .set_remote_addr("127.0.0.1")
+ .set_remote_port("12345")
+ .set_server_addr("127.0.0.1")
+ .set_server_port("80")
+ .set_server_name("jmjoy-pc")
+ .set_content_type("")
+ .set_content_length("0");
+
+ let output = client
+ .execute(Request::new(params, &mut io::empty()))
+ .await
+ .unwrap();
+
+ let stdout = String::from_utf8(output.get_stdout().unwrap_or(Default::default())).unwrap();
+ assert!(stdout.contains("Content-type: text/html; charset=UTF-8"));
+ assert!(stdout.contains("\r\n\r\n"));
+ assert!(stdout.contains("hello"));
+ assert_eq!(output.get_stderr(), None);
+}
+
+#[bench]
+fn bench_execute(b: &mut Bencher) {
+ common::setup();
+
+ let rt = tokio::runtime::Builder::new_multi_thread()
+ .worker_threads(6)
+ .enable_all()
+ .build()
+ .unwrap();
+
+ let mut client = rt.block_on(async {
+ let stream = TcpStream::connect(("127.0.0.1", 9000)).await.unwrap();
+ Client::new(stream, true)
+ });
+
+ b.iter(|| {
+ rt.block_on(async {
+ test_client(&mut client).await;
+ });
+ });
+}

benches/common.rs

@@ -0,0 +1,10 @@
+use std::sync::Once;
+
+static START: Once = Once::new();
+
+/// Setup function that is only run once, even if called multiple times.
+pub fn setup() {
+ START.call_once(|| {
+ env_logger::init();
+ });
+}

src/meta.rs

@@ -80,7 +80,7 @@ impl Header {
 
  loop {
  let read = content.read(&mut buf).await?;
- if had_writen && (read == 0 || read < MAX_LENGTH) {
+ if had_writen && read == 0 {
  break;
  }
 

tests/async_client_post_test.rs

@@ -1,6 +1,6 @@
 use fastcgi_client::{request::Request, Client, Params};
-use std::env::current_dir;
-use tokio::net::TcpStream;
+use std::{env::current_dir, time::Duration};
+use tokio::{net::TcpStream, time::timeout};
 
 mod common;
 
@@ -57,3 +57,52 @@ async fn test() {
  let stderr = dbg!(stderr);
  assert!(stderr.contains("PHP message: PHP Fatal error: Uncaught Exception: TEST"));
 }
+
+#[tokio::test]
+async fn post_big_body() {
+ common::setup();
+
+ let stream = TcpStream::connect(("127.0.0.1", 9000)).await.unwrap();
+ let mut client = Client::new(stream, true);
+
+ let document_root = current_dir().unwrap().join("tests").join("php");
+ let document_root = document_root.to_str().unwrap();
+ let script_name = current_dir()
+ .unwrap()
+ .join("tests")
+ .join("php")
+ .join("body-size.php");
+ let script_name = script_name.to_str().unwrap();
+
+ let body = [0u8; 131072];
+ let len = format!("{}", body.len());
+
+ let params = Params::default()
+ .set_request_method("POST")
+ .set_document_root(document_root)
+ .set_script_name("/body-size.php")
+ .set_script_filename(script_name)
+ .set_request_uri("/body-size.php")
+ .set_query_string("")
+ .set_document_uri("/body-size.php")
+ .set_remote_addr("127.0.0.1")
+ .set_remote_port("12345")
+ .set_server_addr("127.0.0.1")
+ .set_server_port("80")
+ .set_server_name("jmjoy-pc")
+ .set_content_type("text/plain")
+ .set_content_length(&len);
+
+ let output = timeout(
+ Duration::from_secs(3),
+ client.execute(Request::new(params.clone(), &mut &body[..])),
+ )
+ .await
+ .unwrap()
+ .unwrap();
+
+ let stdout = String::from_utf8(output.get_stdout().unwrap_or(Default::default())).unwrap();
+ assert!(stdout.contains("Content-type: text/html; charset=UTF-8"));
+ assert!(stdout.contains("\r\n\r\n"));
+ assert!(stdout.contains("131072"));
+}

tests/php/body-size.php

@@ -0,0 +1,2 @@
+<?php
+echo strlen(file_get_contents("php://input"));