Undo the damage to mod_isapi (leave placeholders for new functions though)

  and add APR_EOL_STR to log files (precomiled, of course :)

PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85881 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index e9b0b9cbdfe9fe3baab36f9a365720804bcfef33..3977cc6d00b065f3732b38c0134e461c8170c0e9 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -236,41 +236,44 @@ int isapi_handler (request_rec *r)
          * sucker in. I suppose this could be bad for memory if someone
          * uploaded the complete works of Shakespeare. Well, WebSite
          * does the same thing.
+         *
+         * But we can be smarter and read up to our 48k and then allow
+         * the ISAPI app to read further blocks as desired.
          */
-            long to_read = atol(ap_table_get(e, "CONTENT_LENGTH"));
-            long read;
+        long to_read = atol(ap_table_get(e, "CONTENT_LENGTH"));
+        long read;
 
-            /* Actually, let's cap it at 48k, until we figure out what
-             * to do with this... we don't want a Content-Length: 1000000000
-             * taking out the machine.
-             */
-
-            if (to_read > 49152) {
-                if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
-                FreeLibrary(isapi_handle);
-                return HTTP_REQUEST_ENTITY_TOO_LARGE;
-            }
+        /* Actually, let's cap it at 48k, until we figure out what
+         * to do with this... we don't want a Content-Length: 1000000000
+         * taking out the machine.
+         */
 
-            ecb->lpbData = ap_pcalloc(r->pool, 1 + to_read);
+        if (to_read > 49152) {
+            if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
+            FreeLibrary(isapi_handle);
+            return HTTP_REQUEST_ENTITY_TOO_LARGE;
+        }
 
-            if ((read = ap_get_client_block(r, ecb->lpbData, to_read)) < 0) {
-                if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
-                FreeLibrary(isapi_handle);
-                return HTTP_INTERNAL_SERVER_ERROR;
-            }
+        ecb->lpbData = ap_pcalloc(r->pool, 1 + to_read);
 
-            /* Although its not to spec, IIS seems to null-terminate
-             * its lpdData string. So we will too. To make sure
-             * cbAvailable matches cbTotalBytes, we'll up the latter
-             * and equalize them.
-             */
-            ecb->cbAvailable = ecb->cbTotalBytes = read + 1;
-            ecb->lpbData[read] = '\0';
+        if ((read = ap_get_client_block(r, ecb->lpbData, to_read)) < 0) {
+            if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
+            FreeLibrary(isapi_handle);
+            return HTTP_INTERNAL_SERVER_ERROR;
         }
+
+        /* Although its not to spec, IIS seems to null-terminate
+         * its lpdData string. So we will too. To make sure
+         * cbAvailable matches cbTotalBytes, we'll up the latter
+         * and equalize them.
+         */
+        ecb->cbAvailable = ecb->cbTotalBytes = read + 1;
+        ecb->lpbData[read] = '\0';
+    }
     else {
-            ecb->cbTotalBytes = 0;
-            ecb->cbAvailable = 0;
-            ecb->lpbData = NULL;
+        ecb->cbTotalBytes = 0;
+        ecb->cbAvailable = 0;
+        ecb->lpbData = NULL;
     }
 
     /* Set up the callbacks */
@@ -409,7 +412,7 @@ BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
 
 BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
 {
-    /* If the request was a huge transmit or chunked, continue piping the
+    /* TODO: If the request was a huge transmit or chunked, continue piping the
      * request here, but if it's of a sane size, continue to ...
      */
     return TRUE;
@@ -454,6 +457,10 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             return TRUE;
 
         case HSE_REQ_SEND_RESPONSE_HEADER_EX:
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
+
+            /* Not yet - but here's the idea...
             if (((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszStatus
                 && ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchStatus)
                 r->status_line = ap_pstrndup(r->pool, 
@@ -464,10 +471,11 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             sscanf(r->status_line, "%d", &r->status);
             cid->ecb->dwHttpStatusCode = r->status;
 
-          ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszHeader; // HTTP header
-          ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchHeader; // HTTP header len
-          
-          ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->fKeepConn; // Keep alive? (bool)
+             * plus we need to handle...
+             * ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszHeader; // HTTP header
+             * ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchHeader; // HTTP header len          
+             * ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->fKeepConn; // Keep alive? (bool)
+             */
 
         case HSE_REQ_SEND_RESPONSE_HEADER:
             r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
@@ -606,6 +614,8 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
 
         /* We don't support all this async I/O, Microsoft-specific stuff */
         case HSE_REQ_IO_COMPLETION:
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
             /* TODO: Emulate a completion port, if we can...
              * Record the callback address and user defined argument...
              * we will call this after any async request (including transmitfile)
@@ -621,11 +631,14 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
                           HTTP_INTERNAL_SERVER_ERROR, r,
                           "ISAPI asynchronous I/O not supported: %s",
                           r->filename);
-
+            return FALSE;
+            
         case HSE_APPEND_LOG_PARAMETER:
             /* Log lpvBuffer, of lpdwSize bytes */
             return TRUE;
 
+        
+        /* Need to implement all applicable for ISAPI 5.0 support */
         case HSE_REQ_ABORTIVE_CLOSE:
         case HSE_REQ_ASYNC_READ_CLIENT:
         case HSE_REQ_CLOSE_CONNECTION:

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 0db20c44a37a65c3c02db4e068a0118985837b4a..00b5d4784dac51ff89ad5a18f65b941b73f281b3 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -583,6 +583,10 @@ static char *parse_log_misc_string(ap_pool_t *p, log_format_item *it,
                *d++ = '\\';
                s++;
                break;
+           case 'r':
+               *d++ = '\r';
+               s++;
+               break;
            case 'n':
                *d++ = '\n';
                s++;
@@ -706,7 +710,7 @@ static ap_array_header_t *parse_log_string(ap_pool_t *p, const char *s, const ch
         }
     }
 
-    s = "\n";
+    s = APR_EOL_STR;
     parse_log_item(p, (log_format_item *) ap_push_array(a), &s);
     return a;
 }

diff --git a/os/win32/mod_isapi.c b/os/win32/mod_isapi.c
index e9b0b9cbdfe9fe3baab36f9a365720804bcfef33..3977cc6d00b065f3732b38c0134e461c8170c0e9 100644 (file)
--- a/os/win32/mod_isapi.c
+++ b/os/win32/mod_isapi.c
@@ -236,41 +236,44 @@ int isapi_handler (request_rec *r)
          * sucker in. I suppose this could be bad for memory if someone
          * uploaded the complete works of Shakespeare. Well, WebSite
          * does the same thing.
+         *
+         * But we can be smarter and read up to our 48k and then allow
+         * the ISAPI app to read further blocks as desired.
          */
-            long to_read = atol(ap_table_get(e, "CONTENT_LENGTH"));
-            long read;
+        long to_read = atol(ap_table_get(e, "CONTENT_LENGTH"));
+        long read;
 
-            /* Actually, let's cap it at 48k, until we figure out what
-             * to do with this... we don't want a Content-Length: 1000000000
-             * taking out the machine.
-             */
-
-            if (to_read > 49152) {
-                if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
-                FreeLibrary(isapi_handle);
-                return HTTP_REQUEST_ENTITY_TOO_LARGE;
-            }
+        /* Actually, let's cap it at 48k, until we figure out what
+         * to do with this... we don't want a Content-Length: 1000000000
+         * taking out the machine.
+         */
 
-            ecb->lpbData = ap_pcalloc(r->pool, 1 + to_read);
+        if (to_read > 49152) {
+            if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
+            FreeLibrary(isapi_handle);
+            return HTTP_REQUEST_ENTITY_TOO_LARGE;
+        }
 
-            if ((read = ap_get_client_block(r, ecb->lpbData, to_read)) < 0) {
-                if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
-                FreeLibrary(isapi_handle);
-                return HTTP_INTERNAL_SERVER_ERROR;
-            }
+        ecb->lpbData = ap_pcalloc(r->pool, 1 + to_read);
 
-            /* Although its not to spec, IIS seems to null-terminate
-             * its lpdData string. So we will too. To make sure
-             * cbAvailable matches cbTotalBytes, we'll up the latter
-             * and equalize them.
-             */
-            ecb->cbAvailable = ecb->cbTotalBytes = read + 1;
-            ecb->lpbData[read] = '\0';
+        if ((read = ap_get_client_block(r, ecb->lpbData, to_read)) < 0) {
+            if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
+            FreeLibrary(isapi_handle);
+            return HTTP_INTERNAL_SERVER_ERROR;
         }
+
+        /* Although its not to spec, IIS seems to null-terminate
+         * its lpdData string. So we will too. To make sure
+         * cbAvailable matches cbTotalBytes, we'll up the latter
+         * and equalize them.
+         */
+        ecb->cbAvailable = ecb->cbTotalBytes = read + 1;
+        ecb->lpbData[read] = '\0';
+    }
     else {
-            ecb->cbTotalBytes = 0;
-            ecb->cbAvailable = 0;
-            ecb->lpbData = NULL;
+        ecb->cbTotalBytes = 0;
+        ecb->cbAvailable = 0;
+        ecb->lpbData = NULL;
     }
 
     /* Set up the callbacks */
@@ -409,7 +412,7 @@ BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
 
 BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
 {
-    /* If the request was a huge transmit or chunked, continue piping the
+    /* TODO: If the request was a huge transmit or chunked, continue piping the
      * request here, but if it's of a sane size, continue to ...
      */
     return TRUE;
@@ -454,6 +457,10 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             return TRUE;
 
         case HSE_REQ_SEND_RESPONSE_HEADER_EX:
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
+
+            /* Not yet - but here's the idea...
             if (((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszStatus
                 && ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchStatus)
                 r->status_line = ap_pstrndup(r->pool, 
@@ -464,10 +471,11 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             sscanf(r->status_line, "%d", &r->status);
             cid->ecb->dwHttpStatusCode = r->status;
 
-          ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszHeader; // HTTP header
-          ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchHeader; // HTTP header len
-          
-          ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->fKeepConn; // Keep alive? (bool)
+             * plus we need to handle...
+             * ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszHeader; // HTTP header
+             * ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchHeader; // HTTP header len          
+             * ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->fKeepConn; // Keep alive? (bool)
+             */
 
         case HSE_REQ_SEND_RESPONSE_HEADER:
             r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
@@ -606,6 +614,8 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
 
         /* We don't support all this async I/O, Microsoft-specific stuff */
         case HSE_REQ_IO_COMPLETION:
+            SetLastError(ERROR_INVALID_PARAMETER);
+            return FALSE;
             /* TODO: Emulate a completion port, if we can...
              * Record the callback address and user defined argument...
              * we will call this after any async request (including transmitfile)
@@ -621,11 +631,14 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
                           HTTP_INTERNAL_SERVER_ERROR, r,
                           "ISAPI asynchronous I/O not supported: %s",
                           r->filename);
-
+            return FALSE;
+            
         case HSE_APPEND_LOG_PARAMETER:
             /* Log lpvBuffer, of lpdwSize bytes */
             return TRUE;
 
+        
+        /* Need to implement all applicable for ISAPI 5.0 support */
         case HSE_REQ_ABORTIVE_CLOSE:
         case HSE_REQ_ASYNC_READ_CLIENT:
         case HSE_REQ_CLOSE_CONNECTION: