[Moin-devel] CVS: MoinMoin cgimain.py,1.48,1.49 httpdmain.py,1.9,1.10

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv32362

Modified Files:
	cgimain.py httpdmain.py 
Log Message:
Fixed some probs in the experimental standalone server


Index: cgimain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** cgimain.py	12 Mar 2002 22:27:35 -0000	1.48
--- cgimain.py	21 Mar 2002 00:18:24 -0000	1.49
***************
*** 92,96 ****
  
      # force input/output to binary
!     if sys.platform == "win32":
          import msvcrt
          msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
--- 92,96 ----
  
      # force input/output to binary
!     if sys.platform == "win32" and not properties.get('standalone', 0):
          import msvcrt
          msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)

Index: httpdmain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/httpdmain.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** httpdmain.py	9 Dec 2001 14:33:45 -0000	1.9
--- httpdmain.py	21 Mar 2002 00:18:24 -0000	1.10
***************
*** 2,10 ****
      MoinMoin - Stand-alone HTTP Server
  
!     Copyright (c) 2001 by Jürgen Hermann <jh at web.de>
      All rights reserved, see COPYING for details.
  
      Significant contributions to this module by R. Church <rc at ghostbitch.org>
  
      $Id$
  """
--- 2,12 ----
      MoinMoin - Stand-alone HTTP Server
  
!     Copyright (c) 2001, 2002 by Jürgen Hermann <jh at web.de>
      All rights reserved, see COPYING for details.
  
      Significant contributions to this module by R. Church <rc at ghostbitch.org>
  
+     RUN THIS AT YOUR OWN RISK, IT HAS BUGS AND IS UNTESTED!
+ 
      $Id$
  """
***************
*** 162,166 ****
                  self.send_response(200)
  
!                 cgimain.run()
  
                  sys.stdout.flush()
--- 164,168 ----
                  self.send_response(200)
  
!                 cgimain.run(properties={'standalone': 1})
  
                  sys.stdout.flush()
***************
*** 204,207 ****
--- 206,211 ----
      # start it
      if sys.platform == 'win32':
+         stdout = sys.stdout
+ 
          # run threaded server
          httpd.serve_in_thread()
***************
*** 211,215 ****
          while not httpd._abort:
              i += 1
!             print "\|/-"[i%4], "\r",
              time.sleep(1)
      else:
--- 215,219 ----
          while not httpd._abort:
              i += 1
!             stdout.write("\|/-"[i%4] + "\r")
              time.sleep(1)
      else: