cvs commit: apache-1.3/src/main http_main.c

[stoddard]

stoddard    99/12/01 14:41:35

  Modified:    src/main http_main.c
  Log:
  Maybe this will help eliminate some of the 'ws2_32.dll is missing' PRs.
  
  Revision  Changes    Path
  1.482     +5 -10     apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.481
  retrieving revision 1.482
  diff -u -r1.481 -r1.482
  --- http_main.c       1999/11/04 19:49:40     1.481
  +++ http_main.c       1999/12/01 22:41:30     1.482
  @@ -3575,28 +3575,23 @@
        return (s_iInitCount);
   
       /* s_iInitCount == 0. Do the initailization */
  -#ifdef NETWARE
       iVersionRequested = MAKEWORD(2, 0);
  -#else
  -    iVersionRequested = MAKEWORD(1, 1);
  -#endif
       err = WSAStartup((WORD) iVersionRequested, &wsaData);
       if (err) {
  +        printf("WSAStartup failed with error %d\n", err);
        s_iInitCount = -1;
        return (s_iInitCount);
       }
  -#ifdef WIN32
  -    if (LOBYTE(wsaData.wVersion) != 1 ||
  -     HIBYTE(wsaData.wVersion) != 1) {
  +
  +    if (LOBYTE(wsaData.wVersion) != 2 ||
  +     HIBYTE(wsaData.wVersion) != 0) {
  +        printf("Apache requires Winsock 2. Please see the Apache FAQ for 
more information.\n");
        s_iInitCount = -2;
        WSACleanup();
        return (s_iInitCount);
       }
  -#endif
  -
       s_iInitCount++;
       return (s_iInitCount);
  -
   }