Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: track proxy in config for whether this is a proxy connection #145

Merged
merged 1 commit into from
Nov 30, 2024
Merged

refactor: track proxy in config for whether this is a proxy connection #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ type t =
{ read_buffer_size : int
; request_body_buffer_size : int
; response_buffer_size : int
; response_body_buffer_size : int }
; response_body_buffer_size : int
; proxy : bool
}

let default =
{ read_buffer_size = 0x1000
; request_body_buffer_size = 0x1000
; response_buffer_size = 0x400
; response_body_buffer_size = 0x1000 }
; response_body_buffer_size = 0x1000
; proxy = false
}
1 change: 1 addition & 0 deletions lib/httpun.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ module Config : sig
; request_body_buffer_size : int (** Default is [4096] *)
; response_buffer_size : int (** Default is [1024] *)
; response_body_buffer_size : int (** Default is [4096] *)
; proxy : bool
}

val default : t
Expand Down
5 changes: 4 additions & 1 deletion lib/reqd.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ type t =
; mutable persistent : bool
; mutable response_state : Response_state.t
; mutable error_code : [`Ok | error ]
; proxy: bool
}

let create
~error_handler
~reader
~writer
~response_body_buffer
~proxy
request
request_body =
{ request
Expand All @@ -91,6 +93,7 @@ let create
; persistent = Request.persistent_connection request
; response_state = Waiting
; error_code = `Ok
; proxy
}

let request { request; _ } = request
Expand Down Expand Up @@ -148,7 +151,7 @@ let unsafe_respond_with_streaming ~flush_headers_immediately t response =
match t.response_state with
| Waiting ->
let encoding =
match Response.body_length ~request_method:t.request.meth response with
match Response.body_length ~proxy:t.proxy ~request_method:t.request.meth response with
| `Fixed _ | `Close_delimited | `Chunked as encoding -> encoding
| `Error (`Bad_gateway | `Internal_server_error) ->
failwith "httpun.Reqd.respond_with_streaming: invalid response body length"
Expand Down
7 changes: 5 additions & 2 deletions lib/server_connection.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ type error_code =
}

type t =
{ reader : Reader.request
{ config : Config.t
; reader : Reader.request
; writer : Writer.t
; response_body_buffer : Bigstringaf.t
; request_handler : request_handler
Expand Down Expand Up @@ -124,6 +125,7 @@ let create ?(config=Config.default) ?(error_handler=default_error_handler) reque
~reader:(Lazy.force reader)
~writer
~response_body_buffer
~proxy:config.proxy
request
request_body
in
Expand All @@ -140,6 +142,7 @@ let create ?(config=Config.default) ?(error_handler=default_error_handler) reque
; error_handler = error_handler
; request_queue
; error_code = No_error
; config
}
in
Lazy.force t
Expand Down Expand Up @@ -197,7 +200,7 @@ let set_error_and_handle ?request t error =
| None -> `GET
| Some (request: Request.t) -> request.meth
in
match Response.body_length ~request_method response with
match Response.body_length ~proxy:t.config.proxy ~request_method response with
| `Fixed _ | `Close_delimited | `Chunked as encoding -> encoding
| `Error (`Bad_gateway | `Internal_server_error) ->
failwith "httpun.Server_connection.error_handler: invalid response body length"
Expand Down