lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

fastcgi: Add php error message parsing

Browse Source
This commit is contained in:
Lorenz Stechauner
2026-06-01 20:20:17 +02:00
parent bb651789ba
commit dbfe0a65a5
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/fastcgi.c
+20 -7
View File
@@ -225,19 +225,24 @@ int fastcgi_close_stdin(fastcgi_cnx_t *cnx) {
} }
int fastcgi_php_error(fastcgi_cnx_t *cnx, char *err_msg) { int fastcgi_php_error(fastcgi_cnx_t *cnx, char *err_msg) {
char *line = NULL, *line_ptr = NULL; char *line = NULL, *line_ptr = NULL, *next_ptr = NULL;
size_t line_len = 0; size_t line_len = 0;
int err = 0; int err = 0;
log_lvl_t msg_type = LOG_INFO; log_lvl_t msg_type = LOG_INFO;
// FIXME php fastcgi sends multiple calls with '; ' as delimiter
for (long ret; cnx->fd_err_bytes > 0 && (ret = getline(&line, &line_len, cnx->err)) != -1; cnx->fd_err_bytes -= ret) { for (long ret; cnx->fd_err_bytes > 0 && (ret = getline(&line, &line_len, cnx->err)) != -1; cnx->fd_err_bytes -= ret) {
if (ret > 0) line[ret - 1] = 0; if (ret > 0) line[ret - 1] = 0;
line_ptr = line; line_ptr = line;
if (strstarts(line_ptr, "PHP message: ")) { if (strstarts(line_ptr, "PHP message: ")) {
line_ptr += 13; line_ptr += 13;
} else if (!strstr(line_ptr, "; PHP message: ")) {
logmsgf(msg_type, "%s", line_ptr);
continue;
}
while (line_ptr) {
if (strstarts(line_ptr, "PHP Warning: ")) { if (strstarts(line_ptr, "PHP Warning: ")) {
msg_type = LOG_WARNING; msg_type = LOG_WARNING;
} else if (strstarts(line_ptr, "PHP Fatal error: ")) { } else if (strstarts(line_ptr, "PHP Fatal error: ")) {
@@ -246,14 +251,22 @@ int fastcgi_php_error(fastcgi_cnx_t *cnx, char *err_msg) {
msg_type = LOG_ERROR; msg_type = LOG_ERROR;
} else if (strstarts(line_ptr, "PHP Notice: ")) { } else if (strstarts(line_ptr, "PHP Notice: ")) {
msg_type = LOG_NOTICE; msg_type = LOG_NOTICE;
} else {
msg_type = LOG_INFO;
} }
}
logmsgf(msg_type, "%s", line_ptr); if ((next_ptr = strstr(line_ptr, "; PHP message: "))) {
next_ptr[0] = 0;
}
if (err_msg && msg_type <= LOG_ERROR && line_ptr != line) { logmsgf(msg_type, "%s", line_ptr);
strcpy_rem_webroot(err_msg, line_ptr, cnx->webroot);
err = 1; if (err_msg && msg_type <= LOG_ERROR && line_ptr != line) {
strcpy_rem_webroot(err_msg, line_ptr, cnx->webroot);
err = 1;
}
line_ptr = next_ptr ? next_ptr + 15 : NULL;
} }
} }