Commit 92cc2746 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Axed C++ comments and tabs. 


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

modules/arch/netware/mod_nw_ssl.c

+7 −7
Changes for modules/arch/netware/mod_nw_ssl.c: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve 
    }



    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,9 +346,9 @@ static int convert_secure_socket(conn_rec *c, apr_socket_t *csd) 
    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 */
@@ -356,7 +356,7 @@ static int convert_secure_socket(conn_rec *c, apr_socket_t *csd) 
        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 socketHnd, char *key, request_rec *r) 


    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 socketHnd, char *key, request_rec *r) 
    sWS2Opts.siddir = NULL;

    sWS2Opts.options = &sNWTLSOpts;



    //setup the nwtlsopts structure

    /* setup the nwtlsopts structure */



    sNWTLSOpts.walletProvider               = WAL_PROV_KMO;

    sNWTLSOpts.keysList                     = NULL;

os/win32/os.h

+5 −5
Changes for os/win32/os.h: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -80,11 +80,11 @@ AP_DECLARE_DATA extern int ap_real_exit_code; 
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);

server/mpm/winnt/service.c

+14 −14
Changes for server/mpm/winnt/service.c: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -694,19 +694,19 @@ apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc, 
         * 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 *ptemp, int signal) 
    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) {

include/httpd.h

+9 −9

File changed.

Contains only whitespace changes.