You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2011/02/26 10:34:48 UTC
svn commit: r1074809 - in /httpd/httpd/trunk: include/httpd.h
modules/arch/netware/mod_nw_ssl.c os/win32/os.h server/mpm/winnt/service.c
Author: fuankg
Date: Sat Feb 26 09:34:47 2011
New Revision: 1074809
URL: http://svn.apache.org/viewvc?rev=1074809&view=rev
Log:
Axed C++ comments and tabs.
Modified:
httpd/httpd/trunk/include/httpd.h
httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
httpd/httpd/trunk/os/win32/os.h
httpd/httpd/trunk/server/mpm/winnt/service.c
Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1074809&r1=1074808&r2=1074809&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Sat Feb 26 09:34:47 2011
@@ -1997,30 +1997,30 @@ AP_DECLARE(const char *) ap_strstr_c(con
#ifdef AP_DEBUG
#undef strchr
-# define strchr(s, c) ap_strchr(s,c)
+# define strchr(s, c) ap_strchr(s,c)
#undef strrchr
-# define strrchr(s, c) ap_strrchr(s,c)
+# define strrchr(s, c) ap_strrchr(s,c)
#undef strstr
# define strstr(s, c) ap_strstr(s,c)
#else
/** use this instead of strchr */
-# define ap_strchr(s, c) strchr(s, c)
+# define ap_strchr(s, c) strchr(s, c)
/** use this instead of strchr */
-# define ap_strchr_c(s, c) strchr(s, c)
+# define ap_strchr_c(s, c) strchr(s, c)
/** use this instead of strrchr */
-# define ap_strrchr(s, c) strrchr(s, c)
+# define ap_strrchr(s, c) strrchr(s, c)
/** use this instead of strrchr */
-# define ap_strrchr_c(s, c) strrchr(s, c)
+# define ap_strrchr_c(s, c) strrchr(s, c)
/** use this instead of strrstr*/
-# define ap_strstr(s, c) strstr(s, c)
+# define ap_strstr(s, c) strstr(s, c)
/** use this instead of strrstr*/
-# define ap_strstr_c(s, c) strstr(s, c)
+# define ap_strstr_c(s, c) strstr(s, c)
#endif
-#define AP_NORESTART APR_OS_START_USEERR + 1
+#define AP_NORESTART APR_OS_START_USEERR + 1
#ifdef __cplusplus
}
Modified: httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c?rev=1074809&r1=1074808&r2=1074809&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c (original)
+++ httpd/httpd/trunk/modules/arch/netware/mod_nw_ssl.c Sat Feb 26 09:34:47 2011
@@ -291,7 +291,7 @@ static int make_secure_socket(apr_pool_t
}
if (mutual) {
- optParam = 0x07; // SO_SSL_AUTH_CLIENT
+ optParam = 0x07; /* SO_SSL_AUTH_CLIENT */
if(WSAIoctl(s, SO_SSL_SET_FLAGS, (char*)&optParam,
sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
@@ -346,17 +346,17 @@ static int convert_secure_socket(conn_re
sWS2Opts.options = &sNWTLSOpts;
if (numcerts) {
- sNWTLSOpts.walletProvider = WAL_PROV_DER; //the wallet provider defined in wdefs.h
- sNWTLSOpts.TrustedRootList = certarray; //array of certs in UNICODE format
- sNWTLSOpts.numElementsInTRList = numcerts; //number of certs in TRList
+ sNWTLSOpts.walletProvider = WAL_PROV_DER; /* the wallet provider defined in wdefs.h */
+ sNWTLSOpts.TrustedRootList = certarray; /* array of certs in UNICODE format */
+ sNWTLSOpts.numElementsInTRList = numcerts; /* number of certs in TRList */
}
else {
/* setup the socket for SSL */
unicpy(keyFileName, L"SSL CertificateIP");
- sWS2Opts.wallet = keyFileName; /* no client certificate */
+ sWS2Opts.wallet = keyFileName; /* no client certificate */
sWS2Opts.walletlen = unilen(keyFileName);
- sNWTLSOpts.walletProvider = WAL_PROV_KMO; //the wallet provider defined in wdefs.h
+ sNWTLSOpts.walletProvider = WAL_PROV_KMO; /* the wallet provider defined in wdefs.h */
}
/* make the IOCTL call */
@@ -406,7 +406,7 @@ static int SSLize_Socket(SOCKET socketHn
loc2uni(UNI_LOCAL_DEFAULT, SASKey, key, 0, 0);
- //setup the tlsserveropts struct
+ /* setup the tlsserveropts struct */
sWS2Opts.wallet = SASKey;
sWS2Opts.walletlen = unilen(SASKey);
sWS2Opts.sidtimeout = 0;
@@ -414,7 +414,7 @@ static int SSLize_Socket(SOCKET socketHn
sWS2Opts.siddir = NULL;
sWS2Opts.options = &sNWTLSOpts;
- //setup the nwtlsopts structure
+ /* setup the nwtlsopts structure */
sNWTLSOpts.walletProvider = WAL_PROV_KMO;
sNWTLSOpts.keysList = NULL;
Modified: httpd/httpd/trunk/os/win32/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/os.h?rev=1074809&r1=1074808&r2=1074809&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/os.h (original)
+++ httpd/httpd/trunk/os/win32/os.h Sat Feb 26 09:34:47 2011
@@ -80,11 +80,11 @@ AP_DECLARE_DATA extern int ap_real_exit_
AP_DECLARE(apr_status_t) ap_os_proc_filepath(char **binpath, apr_pool_t *p);
typedef enum {
- AP_DLL_WINBASEAPI = 0, // kernel32 From WinBase.h
- AP_DLL_WINADVAPI = 1, // advapi32 From WinBase.h
- AP_DLL_WINSOCKAPI = 2, // mswsock From WinSock.h
- AP_DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h
- AP_DLL_defined = 4 // must define as last idx_ + 1
+ AP_DLL_WINBASEAPI = 0, /* kernel32 From WinBase.h */
+ AP_DLL_WINADVAPI = 1, /* advapi32 From WinBase.h */
+ AP_DLL_WINSOCKAPI = 2, /* mswsock From WinSock.h */
+ AP_DLL_WINSOCK2API = 3, /* ws2_32 From WinSock2.h */
+ AP_DLL_defined = 4 /* must define as last idx_ + 1 */
} ap_dlltoken_e;
FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal);
Modified: httpd/httpd/trunk/server/mpm/winnt/service.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/service.c?rev=1074809&r1=1074808&r2=1074809&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/service.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/service.c Sat Feb 26 09:34:47 2011
@@ -694,19 +694,19 @@ apr_status_t mpm_service_install(apr_poo
* depend on it.
*/
/* ###: utf-ize */
- schService = CreateService(schSCManager, // SCManager database
- mpm_service_name, // name of service
- mpm_display_name, // name to display
- SERVICE_ALL_ACCESS, // access required
- SERVICE_WIN32_OWN_PROCESS, // service type
- SERVICE_AUTO_START, // start type
- SERVICE_ERROR_NORMAL, // error control type
- launch_cmd, // service's binary
- NULL, // no load svc group
- NULL, // no tag identifier
- "Tcpip\0Afd\0", // dependencies
- NULL, // use SYSTEM account
- NULL); // no password
+ schService = CreateService(schSCManager, /* SCManager database */
+ mpm_service_name, /* name of service */
+ mpm_display_name, /* name to display */
+ SERVICE_ALL_ACCESS, /* access required */
+ SERVICE_WIN32_OWN_PROCESS, /* service type */
+ SERVICE_AUTO_START, /* start type */
+ SERVICE_ERROR_NORMAL, /* error control type */
+ launch_cmd, /* service's binary */
+ NULL, /* no load svc group */
+ NULL, /* no tag identifier */
+ "Tcpip\0Afd\0", /* dependencies */
+ NULL, /* use SYSTEM account */
+ NULL); /* no password */
if (!schService)
{
@@ -893,7 +893,7 @@ void mpm_signal_service(apr_pool_t *ptem
SC_HANDLE schService;
SC_HANDLE schSCManager;
- schSCManager = OpenSCManager(NULL, NULL, // default machine & database
+ schSCManager = OpenSCManager(NULL, NULL, /* default machine & database */
SC_MANAGER_CONNECT);
if (!schSCManager) {