back out APR_ prefix for TRUE,FALSE (222342c2) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

modules/arch/win32/mod_isapi.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -348,15 +348,15 @@ BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
		if (strlen(result) > *lpdwSizeofBuffer) {
		*lpdwSizeofBuffer = strlen(result);
		SetLastError(ERROR_INSUFFICIENT_BUFFER);
		return APR_FALSE;
		return FALSE;
		}
		strncpy(lpvBuffer, result, *lpdwSizeofBuffer);
		return APR_TRUE;
		return TRUE;
		}

		/* Didn't find it */
		SetLastError(ERROR_INVALID_INDEX);
		return APR_FALSE;
		return FALSE;
		}

		BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
		@@ -370,22 +370,22 @@ BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, ERROR_INVALID_PARAMETER, r,
		"ISAPI asynchronous I/O not supported: %s", r->filename);
		SetLastError(ERROR_INVALID_PARAMETER);
		return APR_FALSE;
		return FALSE;
		}

		if ((writ = ap_rwrite(Buffer, *lpwdwBytes, r)) == EOF) {
		SetLastError(WSAEDISCON); /* TODO: Find the right error code */
		return APR_FALSE;
		return FALSE;
		}

		*lpwdwBytes = writ;
		return APR_TRUE;
		return TRUE;
		}

		BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
		{
		/* Doesn't need to do anything; we've read all the data already */
		return APR_TRUE;
		return TRUE;
		}

		/* XXX: There is an O(n^2) attack possible here. */
		@@ -404,7 +404,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		*/
		ap_table_set (r->headers_out, "Location", lpvBuffer);
		cid->status = cid->r->status = cid->ecb->dwHttpStatusCode = REDIRECT;
		return APR_TRUE;
		return TRUE;

		case HSE_REQ_SEND_URL:
		/* Read any additional input */
		@@ -423,7 +423,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		ap_table_unset(r->headers_in, "Content-Length");

		ap_internal_redirect((char *)lpvBuffer, r);
		return APR_TRUE;
		return TRUE;

		case HSE_REQ_SEND_RESPONSE_HEADER:
		r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
		@@ -439,7 +439,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		*/
		if (!lpdwDataType) {
		ap_send_http_header(r);
		return APR_TRUE;
		return TRUE;
		}

		/* Make a copy - don't disturb the original */
		@@ -458,7 +458,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
		"ISA sent invalid headers: %s", r->filename);
		SetLastError(TODO_ERROR);
		return APR_FALSE;
		return FALSE;
		}

		/* Get rid of \n and \r */
		@@ -480,7 +480,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		SetLastError(TODO_ERROR);
		ap_log_rerror(APLOG_MARK, APLOG_ERR, SERVER_ERROR, r,
		"ISA sent invalid headers", r->filename);
		return APR_FALSE;
		return FALSE;
		}

		*value++ = '\0';
		@@ -532,7 +532,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		/* Any data left should now be sent directly */
		ap_rputs(data, r);

		return APR_TRUE;
		return TRUE;

		case HSE_REQ_MAP_URL_TO_PATH:
		/* Map a URL to a filename */
		@@ -550,13 +550,13 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		((char *)lpvBuffer)[l + 1] = '\0';
		}

		return APR_TRUE;
		return TRUE;

		case HSE_REQ_DONE_WITH_SESSION:
		/* Do nothing... since we don't support async I/O, they'll
		* return from HttpExtensionProc soon
		*/
		return APR_TRUE;
		return TRUE;

		/* We don't support all this async I/O, Microsoft-specific stuff */
		case HSE_REQ_IO_COMPLETION:
		@@ -565,7 +565,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		"ISAPI asynchronous I/O not supported: %s", r->filename);
		default:
		SetLastError(ERROR_INVALID_PARAMETER);
		return APR_FALSE;
		return FALSE;
		}
		}

modules/experimental/mod_example.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -775,7 +775,7 @@ static void example_merge_dir_config(ap_pool_t p, void *parent_conf,
		merged_config->loc = ap_pstrdup(p, nconf->loc);
		/*
		* Others, like the setting of the `congenital' flag, get ORed in. The
		* setting of that particular flag, for instance, is APR_TRUE if it was ever
		* setting of that particular flag, for instance, is TRUE if it was ever
		* true anywhere in the upstream configuration.
		*/
		merged_config->congenital = (pconf->congenital \| pconf->local);

modules/mappers/mod_rewrite.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -197,14 +197,14 @@
		#define CACHE_TLB_ROWS 1024
		#define CACHE_TLB_COLS 4

		#ifndef APR_FALSE
		#define APR_FALSE 0
		#define APR_TRUE !APR_FALSE
		#ifndef FALSE
		#define FALSE 0
		#define TRUE !FALSE
		#endif

		#ifndef NO
		#define NO APR_FALSE
		#define YES APR_TRUE
		#define NO FALSE
		#define YES TRUE
		#endif

		#ifndef RAND_MAX

modules/proxy/proxy_util.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -906,7 +906,7 @@ static const char *
		return host; /* ought to return the port, too */
		}

		/* Return APR_TRUE if addr represents an IP address (or an IP network address) */
		/* Return TRUE if addr represents an IP address (or an IP network address) */
		int ap_proxy_is_ipaddr(struct dirconn_entry This, ap_pool_t p)
		{
		const char *addr = This->name;
		@@ -1010,7 +1010,7 @@ int ap_proxy_is_ipaddr(struct dirconn_entry This, ap_pool_t p)
		return (addr == '\0'); / okay iff we've parsed the whole string */
		}

		/* Return APR_TRUE if addr represents an IP address (or an IP network address) */
		/* Return TRUE if addr represents an IP address (or an IP network address) */
		static int proxy_match_ipaddr(struct dirconn_entry This, request_rec r)
		{
		int i;
		@@ -1102,7 +1102,7 @@ static int proxy_match_ipaddr(struct dirconn_entry This, request_rec r)
		return 0;
		}

		/* Return APR_TRUE if addr represents a domain name */
		/* Return TRUE if addr represents a domain name */
		int ap_proxy_is_domainname(struct dirconn_entry This, ap_pool_t p)
		{
		char *addr = This->name;
		@@ -1135,7 +1135,7 @@ int ap_proxy_is_domainname(struct dirconn_entry This, ap_pool_t p)
		return 1;
		}

		/* Return APR_TRUE if host "host" is in domain "domain" */
		/* Return TRUE if host "host" is in domain "domain" */
		static int proxy_match_domainname(struct dirconn_entry This, request_rec r)
		{
		const char *host = proxy_get_host_of_request(r);
		@@ -1156,7 +1156,7 @@ static int proxy_match_domainname(struct dirconn_entry This, request_rec r)
		&& strncasecmp(&host[h_len - d_len], This->name, d_len) == 0;
		}

		/* Return APR_TRUE if addr represents a host name */
		/* Return TRUE if addr represents a host name */
		int ap_proxy_is_hostname(struct dirconn_entry This, ap_pool_t p)
		{
		struct hostent host;
		@@ -1191,7 +1191,7 @@ int ap_proxy_is_hostname(struct dirconn_entry This, ap_pool_t p)
		return 1;
		}

		/* Return APR_TRUE if host "host" is equal to host2 "host2" */
		/* Return TRUE if host "host" is equal to host2 "host2" */
		static int proxy_match_hostname(struct dirconn_entry This, request_rec r)
		{
		char *host = This->name;
		@@ -1223,14 +1223,14 @@ static int proxy_match_hostname(struct dirconn_entry This, request_rec r)
		&& strncasecmp(host, host2, h1_len) == 0;
		}

		/* Return APR_TRUE if addr is to be matched as a word */
		/* Return TRUE if addr is to be matched as a word */
		int ap_proxy_is_word(struct dirconn_entry This, ap_pool_t p)
		{
		This->matcher = proxy_match_word;
		return 1;
		}

		/* Return APR_TRUE if string "str2" occurs literally in "str1" */
		/* Return TRUE if string "str2" occurs literally in "str1" */
		static int proxy_match_word(struct dirconn_entry This, request_rec r)
		{
		const char *host = proxy_get_host_of_request(r);

os/win32/mod_isapi.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -348,15 +348,15 @@ BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
		if (strlen(result) > *lpdwSizeofBuffer) {
		*lpdwSizeofBuffer = strlen(result);
		SetLastError(ERROR_INSUFFICIENT_BUFFER);
		return APR_FALSE;
		return FALSE;
		}
		strncpy(lpvBuffer, result, *lpdwSizeofBuffer);
		return APR_TRUE;
		return TRUE;
		}

		/* Didn't find it */
		SetLastError(ERROR_INVALID_INDEX);
		return APR_FALSE;
		return FALSE;
		}

		BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
		@@ -370,22 +370,22 @@ BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, ERROR_INVALID_PARAMETER, r,
		"ISAPI asynchronous I/O not supported: %s", r->filename);
		SetLastError(ERROR_INVALID_PARAMETER);
		return APR_FALSE;
		return FALSE;
		}

		if ((writ = ap_rwrite(Buffer, *lpwdwBytes, r)) == EOF) {
		SetLastError(WSAEDISCON); /* TODO: Find the right error code */
		return APR_FALSE;
		return FALSE;
		}

		*lpwdwBytes = writ;
		return APR_TRUE;
		return TRUE;
		}

		BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
		{
		/* Doesn't need to do anything; we've read all the data already */
		return APR_TRUE;
		return TRUE;
		}

		/* XXX: There is an O(n^2) attack possible here. */
		@@ -404,7 +404,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		*/
		ap_table_set (r->headers_out, "Location", lpvBuffer);
		cid->status = cid->r->status = cid->ecb->dwHttpStatusCode = REDIRECT;
		return APR_TRUE;
		return TRUE;

		case HSE_REQ_SEND_URL:
		/* Read any additional input */
		@@ -423,7 +423,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		ap_table_unset(r->headers_in, "Content-Length");

		ap_internal_redirect((char *)lpvBuffer, r);
		return APR_TRUE;
		return TRUE;

		case HSE_REQ_SEND_RESPONSE_HEADER:
		r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
		@@ -439,7 +439,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		*/
		if (!lpdwDataType) {
		ap_send_http_header(r);
		return APR_TRUE;
		return TRUE;
		}

		/* Make a copy - don't disturb the original */
		@@ -458,7 +458,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
		"ISA sent invalid headers: %s", r->filename);
		SetLastError(TODO_ERROR);
		return APR_FALSE;
		return FALSE;
		}

		/* Get rid of \n and \r */
		@@ -480,7 +480,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		SetLastError(TODO_ERROR);
		ap_log_rerror(APLOG_MARK, APLOG_ERR, SERVER_ERROR, r,
		"ISA sent invalid headers", r->filename);
		return APR_FALSE;
		return FALSE;
		}

		*value++ = '\0';
		@@ -532,7 +532,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		/* Any data left should now be sent directly */
		ap_rputs(data, r);

		return APR_TRUE;
		return TRUE;

		case HSE_REQ_MAP_URL_TO_PATH:
		/* Map a URL to a filename */
		@@ -550,13 +550,13 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		((char *)lpvBuffer)[l + 1] = '\0';
		}

		return APR_TRUE;
		return TRUE;

		case HSE_REQ_DONE_WITH_SESSION:
		/* Do nothing... since we don't support async I/O, they'll
		* return from HttpExtensionProc soon
		*/
		return APR_TRUE;
		return TRUE;

		/* We don't support all this async I/O, Microsoft-specific stuff */
		case HSE_REQ_IO_COMPLETION:
		@@ -565,7 +565,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
		"ISAPI asynchronous I/O not supported: %s", r->filename);
		default:
		SetLastError(ERROR_INVALID_PARAMETER);
		return APR_FALSE;
		return FALSE;
		}
		}