[Checkins] [zopefoundation/zope.server] 4f597c: Merged from trunk 25905:

GitHub noreply at github.com
Thu Feb 28 02:32:08 UTC 2013


  Branch: refs/heads/monolithic-zope3-ZopeX3-3.0
  Home:   https://github.com/zopefoundation/zope.server
  Commit: 4f597cacb2cb864c4d2412178d952c434940c73a
      https://github.com/zopefoundation/zope.server/commit/4f597cacb2cb864c4d2412178d952c434940c73a
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-07-02 (Fri, 02 Jul 2004)

  Changed paths:
    A ftp/tests/test_ftpserver.py

  Log Message:
  -----------
  Merged from trunk 25905:
Removed spurious "exception polling in loop(): " output.

Aded code to catch infinate loops (which occasionally occur for me, 
probably related to hyperthreading) and close all conections in test
servers. This will tend to cause test failures, which is good.

There is probably a bug here, but no one has time to chase it down. :(

We'll just have to limp along until we have time to switch to twisted.


  Commit: f76d676d56d135047e62d99e363cf6da08b43ef7
      https://github.com/zopefoundation/zope.server/commit/f76d676d56d135047e62d99e363cf6da08b43ef7
  Author: Fred Drake <fdrake at acm.org>
  Date:   2004-07-16 (Fri, 16 Jul 2004)

  Changed paths:
    A ftp/README.txt

  Log Message:
  -----------
  More ReSTification and consistency changes.


  Commit: fe196dd10197ad9aad02327e3165cb94d8869217
      https://github.com/zopefoundation/zope.server/commit/fe196dd10197ad9aad02327e3165cb94d8869217
  Author: Dmitry Vasiliev <dima at hlabs.spb.ru>
  Date:   2004-07-22 (Thu, 22 Jul 2004)

  Changed paths:
    A ftp/logger.py
    M http/commonaccesslogger.py

  Log Message:
  -----------
  Merged changes from trunk revision 26676


  Commit: d5fccf18b780c44a1acd91526696992797c43bcb
      https://github.com/zopefoundation/zope.server/commit/d5fccf18b780c44a1acd91526696992797c43bcb
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-07-27 (Tue, 27 Jul 2004)

  Changed paths:
    A ftp/server.py
    A ftp/tests/demofs.py

  Log Message:
  -----------
  Merged from trunk

  r26787 | jim | 2004-07-27 10:00:42 -0400 (Tue, 27 Jul 2004) | 4 lines

Moved forbidden and unauthorized exception definitions to
zope.security.interfaces.


  Commit: c4c25aee6e7a85f7079c2fd5727e6084408b7bb8
      https://github.com/zopefoundation/zope.server/commit/c4c25aee6e7a85f7079c2fd5727e6084408b7bb8
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-08-12 (Thu, 12 Aug 2004)

  Changed paths:
    M ftp/server.py
    A ftp/tests/test_demofs.py
    A ftp/tests/test_publisher.py
    M http/tests/test_commonaccesslogger.py
    A interfaces/ftp.py
    A linereceiver/lineserverchannel.py
    A logger/sysloglogger.py
    A maxsockets.py
    A trigger.py

  Log Message:
  -----------
  Backported

r26454 | srichter | 2004-07-13 12:28:46 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26455 | srichter | 2004-07-13 12:32:34 -0400 (Tue, 13 Jul 2004) | 3 
lines
r26456 | srichter | 2004-07-13 12:33:41 -0400 (Tue, 13 Jul 2004) | 3 
lines
r26457 | srichter | 2004-07-13 12:34:28 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26458 | srichter | 2004-07-13 12:37:35 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26459 | srichter | 2004-07-13 12:39:48 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26460 | srichter | 2004-07-13 12:40:26 -0400 (Tue, 13 Jul 2004) | 4 
lines
r26461 | srichter | 2004-07-13 12:41:08 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26462 | srichter | 2004-07-13 12:44:02 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26463 | srichter | 2004-07-13 12:46:02 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26464 | srichter | 2004-07-13 12:48:13 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26465 | srichter | 2004-07-13 12:48:44 -0400 (Tue, 13 Jul 2004) | 4 
lines
r26466 | srichter | 2004-07-13 12:49:20 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26467 | srichter | 2004-07-13 12:49:41 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26468 | srichter | 2004-07-13 12:51:32 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26469 | srichter | 2004-07-13 12:52:22 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26470 | srichter | 2004-07-13 12:53:32 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26471 | srichter | 2004-07-13 12:55:23 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26472 | srichter | 2004-07-13 12:56:24 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26473 | srichter | 2004-07-13 12:56:45 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26474 | srichter | 2004-07-13 12:57:36 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26475 | srichter | 2004-07-13 12:57:58 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26476 | srichter | 2004-07-13 12:59:11 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26477 | srichter | 2004-07-13 13:00:04 -0400 (Tue, 13 Jul 2004) | 4 
lines
r26478 | srichter | 2004-07-13 13:00:36 -0400 (Tue, 13 Jul 2004) | 2 
lines
r26479 | srichter | 2004-07-13 13:01:19 -0400 (Tue, 13 Jul 2004) | 2 
lines


  Commit: dfd820ec5d623c302fa15a55442c544286d533ff
      https://github.com/zopefoundation/zope.server/commit/dfd820ec5d623c302fa15a55442c544286d533ff
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-08-12 (Thu, 12 Aug 2004)

  Changed paths:
    M ftp/tests/demofs.py
    A logger/pythonlogger.py
    A tests/asyncerror.py

  Log Message:
  -----------
  Backported

r26524 | srichter | 2004-07-14 03:45:38 -0400 (Wed, 14 Jul 2004) | 6 lines
r26551 | srichter | 2004-07-15 03:06:37 -0400 (Thu, 15 Jul 2004) | 6 lines
r26522 | pruggera | 2004-07-14 01:42:06 -0400 (Wed, 14 Jul 2004) | 1 line
r26531 | pruggera | 2004-07-14 13:00:15 -0400 (Wed, 14 Jul 2004) | 1 line
r26534 | pruggera | 2004-07-14 15:55:34 -0400 (Wed, 14 Jul 2004) | 1 line
r26540 | pruggera | 2004-07-14 18:14:25 -0400 (Wed, 14 Jul 2004) | 1 line


  Commit: 8822847ce866f6c7aedb928a8b5a979bdf08216d
      https://github.com/zopefoundation/zope.server/commit/8822847ce866f6c7aedb928a8b5a979bdf08216d
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-08-12 (Thu, 12 Aug 2004)

  Changed paths:
    A adjustments.py
    A buffers.py
    A fixedstreamreceiver.py
    M ftp/logger.py
    A ftp/publisher.py
    M ftp/server.py
    A ftp/tests/fstests.py
    M ftp/tests/test_publisher.py
    A http/chunking.py
    M http/commonaccesslogger.py
    A http/httprequestparser.py
    A http/httptask.py
    A http/tests/test_httpserver.py
    A http/tests/test_publisherserver.py
    A linereceiver/linecommandparser.py
    A linereceiver/linetask.py
    A logger/filelogger.py
    A logger/m_syslog.py
    M logger/pythonlogger.py
    A logger/resolvinglogger.py
    A logger/taillogger.py
    A logger/unresolvinglogger.py
    A taskthreads.py

  Log Message:
  -----------
  Backported

r26559 | srichter | 2004-07-15 17:22:32 -0400 (Thu, 15 Jul 2004) | 2 lines
r26560 | srichter | 2004-07-15 17:38:42 -0400 (Thu, 15 Jul 2004) | 2 lines


  Commit: 47fe0bbe910e390b8ca1cd2951a8fbc2c0bc84d6
      https://github.com/zopefoundation/zope.server/commit/47fe0bbe910e390b8ca1cd2951a8fbc2c0bc84d6
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-08-12 (Thu, 12 Aug 2004)

  Changed paths:
    A dualmodechannel.py
    M ftp/server.py
    A ftp/tests/__init__.py
    M ftp/tests/test_ftpserver.py
    A http/httpserver.py
    A http/httpserverchannel.py
    M http/tests/test_commonaccesslogger.py
    A http/tests/test_httpdate.py
    A http/tests/test_httprequestparser.py
    M http/tests/test_httpserver.py
    A interfaces/logger.py
    M linereceiver/lineserverchannel.py
    A logger/rotatingfilelogger.py
    A logger/socketlogger.py
    M logger/sysloglogger.py
    A logger/tests/test_pythonlogger.py
    M maxsockets.py
    M trigger.py
    A utilities.py

  Log Message:
  -----------
  Backported

r26567 | srichter | 2004-07-16 02:58:27 -0400 (Fri, 16 Jul 2004) | 2 lines
r26570 | srichter | 2004-07-16 03:54:40 -0400 (Fri, 16 Jul 2004) | 3 lines


  Commit: c9d01dc296e1ad28b3ebdabed59482cd010ed670
      https://github.com/zopefoundation/zope.server/commit/c9d01dc296e1ad28b3ebdabed59482cd010ed670
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-09-02 (Thu, 02 Sep 2004)

  Changed paths:
    M adjustments.py
    M dualmodechannel.py
    M ftp/server.py
    A interfaces/__init__.py
    A serverbase.py
    A serverchannelbase.py

  Log Message:
  -----------
  Merged from trunk:

  r27408 | shane | 2004-09-02 01:31:25 -0400 (Thu, 02 Sep 2004) | 12 lines

  DualModeChannel no longer attempts to close except in the main thread.

  Also simplified by removing the experimental SimultaneousModeChannel 
  class.  DualModeChannel is ambitious enough already.  We don't need to 
  expose even more bugs in asyncore.

  The advantage of closing in application threads is that it forces the 
  TCP stack to flush buffers immediately, resulting in a quick response.  
  However, TCP_NODELAY should have the same effect, so in theory, no speed 
  has been lost.


  ------------------------------------------------------------------------
  r27407 | shane | 2004-09-02 01:24:05 -0400 (Thu, 02 Sep 2004) | 5 lines

  Added a method of setting socket options and turned on TCP_NODELAY.

  Zope buffers everything already, so the Nagle algorithm is likely 
  to delay unnecessarily in most forseeable cases.

  ------------------------------------------------------------------------
  r27406 | shane | 2004-09-02 01:20:28 -0400 (Thu, 02 Sep 2004) | 2 lines

  Improved wording in interface docstrings


  Commit: 4dc1de135e8a5791e1eeebb7d23a86c0f1645652
      https://github.com/zopefoundation/zope.server/commit/4dc1de135e8a5791e1eeebb7d23a86c0f1645652
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-09-13 (Mon, 13 Sep 2004)

  Changed paths:
    M ftp/server.py
    M ftp/tests/test_ftpserver.py
    M http/httptask.py
    M http/tests/test_httpserver.py
    M interfaces/__init__.py
    M linereceiver/lineserverchannel.py
    M linereceiver/linetask.py
    M serverchannelbase.py
    M taskthreads.py

  Log Message:
  -----------
  Merged from trunk:

r27442 | shane | 2004-09-03 04:16:55 -0400 (Fri, 03 Sep 2004) | 16 lines

Simplified serverchannelbase, hopefully fixing intermittent bugs.

The FTP server needed a way to queue a task in the channel.  It used 
start_task, but start_task had no way to queue tasks correctly if tasks 
already happened to be running.  So an assertion failure resulted 
occasionally.

Now, there is a queue of tasks rather than a queue of requests.  
Anything that needs to can send a task to a channel.  The task will be 
executed in synchronous mode.

Also, the basic request parsing is now done in the asyncore main thread.  
When SimultaneousModeChannel was dropped, it became impossible to receive 
data in application threads anyway.


------------------------------------------------------------------------
r27441 | shane | 2004-09-03 04:07:01 -0400 (Fri, 03 Sep 2004) | 2 lines

After the timeout, stop waiting for threads to exit.

------------------------------------------------------------------------
r27440 | shane | 2004-09-03 04:06:17 -0400 (Fri, 03 Sep 2004) | 5 lines

Allow old asyncore connections to close before testing.

This seems to fix the spurious messages about leaking sockets.  However, 
other tests shouldn't be leaving open sockets around.


  Commit: 57dfda2cdf99a392375819c00aaccedb2efd81fb
      https://github.com/zopefoundation/zope.server/commit/57dfda2cdf99a392375819c00aaccedb2efd81fb
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-09-13 (Mon, 13 Sep 2004)

  Changed paths:
    M dualmodechannel.py
    M ftp/server.py
    M ftp/tests/demofs.py
    M ftp/tests/test_ftpserver.py
    M http/tests/test_httpserver.py
    M linereceiver/lineserverchannel.py

  Log Message:
  -----------
  Merged from trunk:

r27460 | shane | 2004-09-06 21:52:16 -0400 (Mon, 06 Sep 2004) | 13 lines

Call close_when_done() rather than close() in FTP data connections.

ftp/server.py: a lot of rearranging was necessary to fix code that 
called close() with arguments.  It's important to send a report at the 
end of FTP data connections, but the old way relied on close() with 
arguments and we sometimes need to call close_when_done() instead of 
close().

dualmodechannel.py: added an assertion that verifies close() is always 
called in asynchronous mode.  See the comment.



------------------------------------------------------------------------
r27459 | shane | 2004-09-06 21:45:52 -0400 (Mon, 06 Sep 2004) | 2 lines

If the file does not exist, it is simply not writable.  No OSError needed.

------------------------------------------------------------------------
r27458 | shane | 2004-09-06 21:32:54 -0400 (Mon, 06 Sep 2004) | 2 lines

close_when_done() when handling errors, rather than close()

------------------------------------------------------------------------
r27457 | shane | 2004-09-06 21:32:04 -0400 (Mon, 06 Sep 2004) | 2 lines

Let Ctrl-C kill the thread


  Commit: 93f9e923c399247b3e18c84204d92ba9013d7cf2
      https://github.com/zopefoundation/zope.server/commit/93f9e923c399247b3e18c84204d92ba9013d7cf2
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-09-13 (Mon, 13 Sep 2004)

  Changed paths:
    M dualmodechannel.py
    M ftp/server.py
    M serverchannelbase.py

  Log Message:
  -----------
  Merged from trunk:

  r27500 | shane | 2004-09-12 02:02:38 -0400 (Sun, 12 Sep 2004) | 12 lines

Another go at fixing the asyncore errors.

Strategy:
1. Move work into the main thread, since it's more predictable than 
threads.
2. Work around asyncore idiosyncracies.  For example, I just found out 
that if you close() twice, you might remove some other socket from the 
map.  Wow, dude.
3. Run the unit tests repeatedly, although they still pass 100% of the 
time for me.  Bummer.


  Commit: 8dd9eb301493ffd21de223a645dcf836a483eb51
      https://github.com/zopefoundation/zope.server/commit/8dd9eb301493ffd21de223a645dcf836a483eb51
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-09-13 (Mon, 13 Sep 2004)

  Changed paths:
    M ftp/tests/test_ftpserver.py

  Log Message:
  -----------
  Merged from trunk:

  r27419 | jim | 2004-09-02 06:53:34 -0400 (Thu, 02 Sep 2004) | 10 lines

Tried to improve error handling in the look method:

- Remove (only) entries from socket map with bad file 
  descriptors

- Print a report of good and bad file descriptors

- Try hard not to fail out of the loop, as that is likely to
  lead to a test hang.


  Commit: 3a0b94a6d8269ceb4c61af35a8bf4b858ec06baa
      https://github.com/zopefoundation/zope.server/commit/3a0b94a6d8269ceb4c61af35a8bf4b858ec06baa
  Author: Philipp von Weitershausen <philipp at weitershausen.de>
  Date:   2005-07-25 (Mon, 25 Jul 2005)

  Changed paths:
    M http/tests/test_httpserver.py

  Log Message:
  -----------
  Merge r29561 from ZopeX3-3.0.0-Zope-2.8 branch a.k.a r29928 from the trunk:

Log message for revision 29561:
  Fixed an import glitch.

Log message for revision 29928:
  Fixed a function call thast caused many tests to fail with "-N 2"


Compare: https://github.com/zopefoundation/zope.server/compare/4f597cacb2cb^...3a0b94a6d826


More information about the checkins mailing list