Author: rhuijben
Date: Thu Nov 19 13:18:55 2015
New Revision: 1715173
URL: http://svn.apache.org/viewvc?rev=1715173&view=rev
Log:
Following up on r1715172 fix a bad fix in the fcgi code.
* protocols/fcgi_protocol.c
(serf_fcgi_protocol_t): Drop typedef that is also in .h.
(fcgi_process): Remove use of 2 argument #define.
* protocols/fcgi_protocol.h
(SERF_LOGFCGI): Remove.
Modified:
serf/trunk/protocols/fcgi_protocol.c
serf/trunk/protocols/fcgi_protocol.h
Modified: serf/trunk/protocols/fcgi_protocol.c
URL:
http://svn.apache.org/viewvc/serf/trunk/protocols/fcgi_protocol.c?rev=1715173&r1=1715172&r2=1715173&view=diff
==============================================================================
--- serf/trunk/protocols/fcgi_protocol.c (original)
+++ serf/trunk/protocols/fcgi_protocol.c Thu Nov 19 13:18:55 2015
@@ -34,7 +34,7 @@
#define SERF_ERROR_FCGI_RECORD_SIZE_ERROR SERF_ERROR_HTTP2_FRAME_SIZE_ERROR
#define SERF_ERROR_FCGI_PROTOCOL_ERROR SERF_ERROR_HTTP2_PROTOCOL_ERROR
-typedef struct serf_fcgi_protocol_t
+struct serf_fcgi_protocol_t
{
serf_connection_t *conn;
serf_incoming_t *client;
@@ -56,7 +56,7 @@ typedef struct serf_fcgi_protocol_t
bool no_keep_conn;
-} serf_fcgi_protocol_t;
+};
static apr_status_t fcgi_cleanup(void *baton)
{
@@ -214,7 +214,8 @@ static apr_status_t fcgi_process(serf_fc
SERF_FCGI_assert(fcgi->read_frame != NULL);
}
- serf__log(LOGLVL_INFO, SERF_LOGFCGI, __FILE__, fcgi->config,
+ serf__log(LOGLVL_INFO, SERF_LOGCOMP_PROTOCOL, __FILE__,
+ fcgi->config,
"Reading 0x%x frame, stream=0x%x\n",
frametype, sid);
Modified: serf/trunk/protocols/fcgi_protocol.h
URL:
http://svn.apache.org/viewvc/serf/trunk/protocols/fcgi_protocol.h?rev=1715173&r1=1715172&r2=1715173&view=diff
==============================================================================
--- serf/trunk/protocols/fcgi_protocol.h (original)
+++ serf/trunk/protocols/fcgi_protocol.h Thu Nov 19 13:18:55 2015
@@ -30,9 +30,6 @@
#define SERF_FCGI_assert(x) ((void)0)
#endif
-#define SERF_LOGFCGI \
- SERF_LOGCOMP_PROTOCOL, (__FILE__ ":" APR_STRINGIFY(__LINE__))
-
#ifdef __cplusplus
extern "C" {
#endif
