Skip to content

Commit befc4b6

Browse files
committed
Don't increment phase handler
1 parent 89d30d6 commit befc4b6

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ setup-docker:
115115
stop:
116116
@docker compose -f $(DOCKER_COMPOSE_MAIN) down --remove-orphans 2>/dev/null || true
117117
ifndef GITHUB_ACTIONS
118+
@# Stop nginx if running
119+
@-[ -f $(PID_FILE) ] && kill -TERM $$(cat $(PID_FILE)) 2>/dev/null || true
120+
@-[ -f $(PID_FILE) ] && rm -f $(PID_FILE) 2>/dev/null || true
121+
@# Stop backend services
118122
@-kill $$(cat /tmp/echo-server.pid 2>/dev/null) 2>/dev/null || true
119123
@-kill $$(cat /tmp/extproc_mock.pid 2>/dev/null) 2>/dev/null || true
120124
@rm -f /tmp/extproc_mock.pid /tmp/echo-server.pid 2>/dev/null || true
@@ -130,10 +134,12 @@ else
130134
endif
131135

132136
test-docker:
137+
@echo "Building module for NGINX version: $$(grep 'FROM nginx:' docker/nginx/Dockerfile | head -1 | sed 's/.*nginx://' | sed 's/-.*//')"
133138
docker compose -f $(DOCKER_COMPOSE_MAIN) up --build -d
134139
DOCKER_ENVIRONMENT=main ./tests/test-config.sh
135140

136141
test-local: start-local
142+
@echo "Building module for NGINX version: $$(nginx -v 2>&1 | sed 's|nginx version: nginx/||')"
137143
./tests/test-config.sh
138144

139145
# Configuration generation

src/modules/bbr.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,8 @@ pub unsafe extern "C" fn bbr_body_read_handler(r: *mut ngx::ffi::ngx_http_reques
229229
// Using default model is normal behavior - no logging needed
230230
}
231231

232-
// Body processing complete - continue request phases
233-
// Mark body as processed and continue with next phases
234-
(*r).phase_handler += 1;
232+
// Body processing complete - resume NGINX phase processing
233+
// We must call ngx_http_core_run_phases(r) to continue after async body reading
235234
ngx::ffi::ngx_http_core_run_phases(r);
236235
}
237236

0 commit comments

Comments
 (0)