diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:08 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:08 +0100 |
| commit | 80ba9f34b69a273d82f2f46d7fe231e30e127028 (patch) | |
| tree | 7b43a6f17b53cb4ad4f9aea2503ef590b30bff50 /modules/echo | |
| parent | 80db94fff6a9620fb469ee911347ed973e3f7735 (diff) | |
| download | apache2-80ba9f34b69a273d82f2f46d7fe231e30e127028.tar.gz | |
Upstream tarball 2.2.4upstream/2.2.4
Diffstat (limited to 'modules/echo')
| -rw-r--r-- | modules/echo/mod_echo.c | 6 | ||||
| -rw-r--r-- | modules/echo/mod_echo.dsp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c index 6c8a4113..ddbe972c 100644 --- a/modules/echo/mod_echo.c +++ b/modules/echo/mod_echo.c @@ -63,9 +63,9 @@ static int process_echo_connection(conn_rec *c) bb = apr_brigade_create(c->pool, c->bucket_alloc); /* Get a single line of input from the client */ - if ((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE, - APR_BLOCK_READ, 0) != APR_SUCCESS || - APR_BRIGADE_EMPTY(bb))) { + if (((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE, + APR_BLOCK_READ, 0)) != APR_SUCCESS) || + APR_BRIGADE_EMPTY(bb)) { apr_brigade_destroy(bb); break; } diff --git a/modules/echo/mod_echo.dsp b/modules/echo/mod_echo.dsp index ad2acf2d..2510e7d1 100644 --- a/modules/echo/mod_echo.dsp +++ b/modules/echo/mod_echo.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /fo"Release/mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d "BIN_NAME=mod_echo.so" /d "LONG_NAME=echo_module for Apache" +# ADD RSC /l 0x409 /fo"Release/mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_echo.so" /d LONG_NAME="echo_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -73,7 +73,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /fo"Debug/mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d "BIN_NAME=mod_echo.so" /d "LONG_NAME=echo_module for Apache" +# ADD RSC /l 0x409 /fo"Debug/mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_echo.so" /d LONG_NAME="echo_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo |