Merge pull request #1 from hhatto/modernize-2025

Modernize 2025

Author: hhatto

Cargo.lock

@@ -2,15 +2,16 @@
 name = "kamasu"
 version = "0.2.0"
 authors = ["Hideo Hattori <hhatto.jp@gmail.com>"]
+edition = "2021"
 
 [dependencies]
-tokio-core = "0.1"
-tokio-io = "0.1"
-tokio-tls = "0.1"
-native-tls = "0.1"
-tls-api = "0.1"
-tls-api-openssl = "0.1.9"
-futures = "0.1"
-httpbis = "0.4.1"
-clap = "2"
-hyper = { "git" = "https://github.com/hyperium/hyper.git" }
+tokio = { version = "1", features = ["full"] }
+hyper = { version = "1", features = ["full"] }
+hyper-util = { version = "0.1", features = ["full"] }
+http-body-util = "0.1"
+bytes = "1"
+clap = "4"
+tokio-rustls = "0.26"
+rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
+rustls-pki-types = "1"
+rcgen = "0.14"

Cargo.toml

@@ -8,18 +8,14 @@ HTTP Proxy Sever for PHP Built-in Server, written in Rust.
         |                     |  +----> |           php built-in server          | |-+
   HTTP  |    +--------+  HTTP |  |+---> | (child proc via std::process::Command) | | |
  ----------->| thread |----------+|+--> |                                        | | |
-        |    | (http) |       |   ||    +----------------------------------------+ | |
-        |    +---------       |   ||      +----------------------------------------+ |
-        |                     |   ||        +----------------------------------------+
-  HTTPS |    +--------+  HTTP |   ||                        :
- ----------->| thread |-----------+|                        : N procs
-        |    | (https)|       |    |                        :
-        |    +--------+       |    |
-        |                     |    |
-  HTTP2 |    +--------+  HTTP |    |
- ----------->| thread |------------+
-        |    | (http2)|       |
+        |    | (http) |       |   |     +----------------------------------------+ | |
+        |    +---------       |   |       +----------------------------------------+ |
+        |                     |   |         +----------------------------------------+
+  H2/HTTPS   +--------+  HTTP |   |                         :
+ ----------->| thread |-----------+                         : N procs
+        |    | (https)|       |                             :
         |    +--------+       |
+        |                     |
         +---------------------+
 ```
 
@@ -31,8 +27,14 @@ $ cargo install --git https://github.com/hhatto/kamasu.git
 
 ## Usage
 
+with HTTP:
 ```
-$ kamasu -S 127.0.0.1:8080 -n 4 -t ./your/docroot -c php.ini
+$ kamasu -S 127.0.0.1:8080 -n 4 -t /your/docroot -c php.ini
+```
+
+with H2(HTTPS):
+```
+$ kamasu --https 127.0.0.1:8443 -n 4 -t /your/docroot -c php.ini
 ```
 
 ## License

README.md

@@ -0,0 +1,11 @@
+<?php
+header('Content-Type: application/json');
+
+echo json_encode([
+    'status' => 'ok',
+    'message' => 'Hello from kamasu!',
+    'method' => $_SERVER['REQUEST_METHOD'],
+    'path' => $_SERVER['REQUEST_URI'],
+    'time' => date('Y-m-d H:i:s'),
+    'pid' => getmypid(),
+]);

example/index.php

@@ -0,0 +1,4 @@
+; Minimal php.ini for kamasu example
+display_errors = On
+error_reporting = E_ALL
+date.timezone = Asia/Tokyo