MFH:- Fixed bug #48419 (non-portable STDIN fileno in cgi_main.c)

# This doesn't really fix it since it's some weird Windows thing but this
# does make this code slightly more portable :)

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index d621ec96a69827d1191770dfcf5f62a751ce3a11..8bcc46b96effc8ac253cdd5586f8129d35ef8ca6 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -461,6 +461,9 @@ static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
        return SAPI_HEADER_SENT_SUCCESSFULLY;
 }
 
+#ifndef STDIN_FILENO
+# define STDIN_FILENO 0
+#endif
 
 static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
 {
@@ -473,10 +476,10 @@ static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
                        fcgi_request *request = (fcgi_request*) SG(server_context);
                        tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);
                } else {
-                       tmp_read_bytes = read(0, buffer + read_bytes, count_bytes - read_bytes);
+                       tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes);
                }
 #else
-               tmp_read_bytes = read(0, buffer + read_bytes, count_bytes - read_bytes);
+               tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes);
 #endif
 
                if (tmp_read_bytes <= 0) {