Differences From Artifact [aa1c10a643]:

• File src/main.c — part of check-in [a3ade26568] at 2015-02-07 16:59:40 on branch trunk — If file descriptor 2 is not open, try twice to open it. If it still is not open, just continue on, because presumably it won't open on any subquent open() system call. (user: drh size: 77258)

To Artifact [2cb57c6a2c]:

• File src/main.c — part of check-in [bd60090134] at 2015-02-07 19:48:10 on branch trunk — Improvements to detections and attempted mitigation of the file-descriptor 2 not open problem sometimes seen with stunnel4. (user: drh size: 77336)

689
690
691
692
693
694
695
696

697
698
699
700
701
702
703
704

      g.argv = zNewArgv;
    }
    zCmdName = g.argv[1];
  }
#ifndef _WIN32
  /* Make sure open() will not return file descriptor 2. */
  { int nTry = 0;
    while( !is_valid_fd(2) && nTry++ < 2 ){

      open("/dev/null", O_WRONLY);
    }
  }
#endif
  rc = name_search(zCmdName, aCommand, count(aCommand), FOSSIL_FIRST_CMD, &idx);
  if( rc==1 ){
#ifdef FOSSIL_ENABLE_TH1_HOOKS
    if( !g.isHTTP && !g.fNoThHook ){

|
>
|

689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705

      g.argv = zNewArgv;
    }
    zCmdName = g.argv[1];
  }
#ifndef _WIN32
  /* Make sure open() will not return file descriptor 2. */
  { int nTry = 0;
    while( !is_valid_fd(2) && nTry++ < 2 && open("/dev/null",O_WRONLY)>0 ){}
    if( !is_valid_fd(2) ){
      fossil_fatal("file descriptor 2 is not open");
    }
  }
#endif
  rc = name_search(zCmdName, aCommand, count(aCommand), FOSSIL_FIRST_CMD, &idx);
  if( rc==1 ){
#ifdef FOSSIL_ENABLE_TH1_HOOKS
    if( !g.isHTTP && !g.fNoThHook ){