punjab-krb5-preauth
13 years agoMerge branch 'pull_request_5'
Christopher Zorn [Wed, 4 May 2011 16:45:13 +0000 (09:45 -0700)]
Merge branch 'pull_request_5'

13 years agochange documentation and small formatting changes
Christopher Zorn [Wed, 4 May 2011 16:45:02 +0000 (09:45 -0700)]
change documentation and small formatting changes

13 years agoMerge https://github.com/zewt/punjab into pull_request_5
Christopher Zorn [Wed, 4 May 2011 16:30:06 +0000 (09:30 -0700)]
Merge https://github.com/zewt/punjab into pull_request_5

13 years agoReplace .tac instructions.
Glenn Maynard [Wed, 4 May 2011 04:35:50 +0000 (00:35 -0400)]
Replace .tac instructions.

It's much simpler to run the server by running it directly as a plugin,
instead of messing with a .tac file, which almost nobody really needs to
do.  For people not familiar with Twisted (myself, until a few days ago),
having it in here is confusing, since we don't know the normal way of
running the application.

Maybe the .tac file should be removed.

13 years agoUpdate the twisted plugin to not use mktap.
Glenn Maynard [Wed, 4 May 2011 04:32:03 +0000 (00:32 -0400)]
Update the twisted plugin to not use mktap.

This uses the mechanism shown here:

http://www.opendocs.net/python/twisted/howto/tap.html

punjab.py had to be renaemd to punjab_plugin.py, because punjab.py
is unable to import the "punjab" module--it just pulls itself in.
Relative imports don't help here, since twisted/plugins isn't
a module.

This also eliminates a deprecation warning when running the server.

13 years agoSupport SSL certificate chains.
Glenn Maynard [Wed, 4 May 2011 00:12:22 +0000 (20:12 -0400)]
Support SSL certificate chains.

Most certificate authorities now require certificate chains, but Twisted
is using a call that only supports a single certificate.  Override it.

13 years agoMerge branch 'pull_request_4'
Christopher Zorn [Mon, 2 May 2011 18:46:14 +0000 (11:46 -0700)]
Merge branch 'pull_request_4'

13 years agoadd zewt as a contributor
Christopher Zorn [Mon, 2 May 2011 18:46:01 +0000 (11:46 -0700)]
add zewt as a contributor

13 years agosmall fix for testStreamError and lots of whitespace cleanup
Christopher Zorn [Mon, 2 May 2011 18:26:05 +0000 (11:26 -0700)]
small fix for testStreamError and lots of whitespace cleanup

13 years agoAdd a test for sending stanzas within a terminate message.
Glenn Maynard [Fri, 29 Apr 2011 21:13:23 +0000 (17:13 -0400)]
Add a test for sending stanzas within a terminate message.

Make sure that <body type='terminate'><presence/></body> sends
<presence/> to the server before terminating the connection.

13 years agoFix server terminations not being reported reliably.
Glenn Maynard [Fri, 29 Apr 2011 21:08:58 +0000 (17:08 -0400)]
Fix server terminations not being reported reliably.

If the XMPP server closes the connection when there's no active
connection to the client, the session was abruptly closed, causing an
"unknown SID" condition the next time the client connects.

Like streamError, if connectError happens while we have no outstanding
requests, store the error and report it when we do.

Call stopTrying explicitly.  This is done when expire() is called, but we
may not call expire().

(The "pending error" logic matches streamError exactly, and they should be
merged.)

13 years agoTest both sides closing the connection at the same time.
Glenn Maynard [Fri, 29 Apr 2011 21:05:16 +0000 (17:05 -0400)]
Test both sides closing the connection at the same time.

(This previously caused an Unhandled Error log.)

13 years agoFix unhandled error in certain termination conditions.
Glenn Maynard [Fri, 29 Apr 2011 20:58:30 +0000 (16:58 -0400)]
Fix unhandled error in certain termination conditions.

If stream_error is set (the server is closing the connection), and the
client sends <body type=terminate>, then session.terminate() is called
twice and the Deferred created by _parse is thrown away; that Deferred
turns into an unhandled error.  Simplify _parse.

13 years agoPartial fix for legacy port 5223 SSL connections.
Glenn Maynard [Fri, 29 Apr 2011 16:47:10 +0000 (12:47 -0400)]
Partial fix for legacy port 5223 SSL connections.

xmlstream.ssl exist, so 'if port == 5223 and xmlstream.ssl' was
throwing an exception.  self.connectFunc is actually connectFuncName.
self.connectFuncArgs should be a tuple.

Support "ssl.supported", which is documented in twisted.internet.ssl.
(This is completely braindamaged and ignores all standard conventions
for Python modules...)

I'm not sure that this is completely fixed, as I don't have a port 5223
XMPP server to test with right now, but it's at least attempting to
connect and not failing outright.

13 years agoRemove no-op special case.
Glenn Maynard [Fri, 29 Apr 2011 16:05:58 +0000 (12:05 -0400)]
Remove no-op special case.

If (not self.servers and not self.orderedServers), then
SRVConnector.pickServer returned (self.domain, self.service).

self.service is xmpp-client, which was passed in __init__; xmpp-client
means 5222, so this doesn't do anything.

13 years agoInitialize more of Session inside Session itself, like a normal class.
Glenn Maynard [Fri, 29 Apr 2011 15:19:27 +0000 (11:19 -0400)]
Initialize more of Session inside Session itself, like a normal class.

13 years agoPer spec, return item-not-found per spec on key mismatch, not 404.
Glenn Maynard [Fri, 29 Apr 2011 07:38:28 +0000 (03:38 -0400)]
Per spec, return item-not-found per spec on key mismatch, not 404.

13 years agoFixup and test rekeying.
Glenn Maynard [Fri, 29 Apr 2011 06:43:37 +0000 (02:43 -0400)]
Fixup and test rekeying.

See the tests for some cases that were failing; for example, including
@key in a session with no key caused an exception.

The tests use defer.inlineCallbacks and get_body_node, to make them
more concise and easier to follow.

13 years agoSet a correct num_keys when initializing Keys().
Glenn Maynard [Fri, 29 Apr 2011 06:41:40 +0000 (02:41 -0400)]
Set a correct num_keys when initializing Keys().

(Leftover from debugging.)

13 years agoUse send_body_node() from send().
Glenn Maynard [Fri, 29 Apr 2011 06:40:28 +0000 (02:40 -0400)]
Use send_body_node() from send().

13 years agoAdd and use TestCase.get_body_node helper.
Glenn Maynard [Fri, 29 Apr 2011 06:37:35 +0000 (02:37 -0400)]
Add and use TestCase.get_body_node helper.

This handles most of the common <body/> node setup used by each test.

13 years agoAdd a TestCase.connect() helper method.
Glenn Maynard [Fri, 29 Apr 2011 06:34:50 +0000 (02:34 -0400)]
Add a TestCase.connect() helper method.

This automatically stores the received SID, so this doesn't need to
be done in every test.  (This isn't used yet.)

13 years agoIf msg is None, don't overwrite the msg and stanza_error fields set from the derived...
Glenn Maynard [Fri, 29 Apr 2011 06:29:16 +0000 (02:29 -0400)]
If msg is None, don't overwrite the msg and stanza_error fields set from the derived class.

13 years agoRemove remaining deprecated hash modules, and fix up httpb_client.Keys.
Glenn Maynard [Fri, 29 Apr 2011 04:15:25 +0000 (00:15 -0400)]
Remove remaining deprecated hash modules, and fix up httpb_client.Keys.

This encapsulates the logic of when to send 'key' and 'newkey'.

This might fix the XXX within _initializeStream, but I didn't try
enabling it there.

13 years agoRemove unused, deprecated sha import.
Glenn Maynard [Fri, 29 Apr 2011 03:22:21 +0000 (23:22 -0400)]
Remove unused, deprecated sha import.

13 years agoFix error handling when invalid XML is received from the server.
Glenn Maynard [Fri, 29 Apr 2011 03:03:36 +0000 (23:03 -0400)]
Fix error handling when invalid XML is received from the server.

An exception was being raised on XML parse errors on
'getattr(streamerror.value, "element")', because streamerror isn't
necessarily a StreamError.  If it's anything else, it's not a
stream:error.  Fix the exception.  Send remote-connection-failed
instead of remote-stream-error; this is a connection failure akin
to losing the TCP connection, not an encapsulated stream:error
from the XMPP server.  Add a test.

13 years agoAdd a test for stream:error handling.
Glenn Maynard [Fri, 29 Apr 2011 02:25:58 +0000 (22:25 -0400)]
Add a test for stream:error handling.

Test 21233171a7c1fe5173e81c298b249fea149e6b5c, by including arbitrary
data in the stream:error and checking that it's passed through.

13 years agoFixup testSessionTimeout.
Glenn Maynard [Fri, 29 Apr 2011 01:29:24 +0000 (21:29 -0400)]
Fixup testSessionTimeout.

The actual problem here was that tests are expected to chain by
returning Deferreds, but the Deferred objects weren't being returned.
The part that tripped me up before was that reactor.callLater doesn't
return a Deferred; task.deferLater does that.  Once that's used, the
callbacks and errors propagate like they're supposed to, normal
assertions can be used, and no weird error propagation hacks are needed.

13 years agoFix the "A stream error needs to be returned" error.
Glenn Maynard [Fri, 29 Apr 2011 01:11:27 +0000 (21:11 -0400)]
Fix the "A stream error needs to be returned" error.

When raised, this error is passed to the _testStreamError errback, which
needs to propagate the error, like testWhiteListError does.  (Other tests
probably need to do this, too.)

13 years agoFix errors in testSessionTimeout cause long timeouts.
Glenn Maynard [Fri, 29 Apr 2011 00:18:13 +0000 (20:18 -0400)]
Fix errors in testSessionTimeout cause long timeouts.

Errors in this test are being raised from within callbacks which
are being fired on Deferred objects other than the one returned
from the test itself.  This causes the test runner to never see
them, so the test sits around until the whole test times out.

Fix this by adding an errback to the two separate Deferred objects,
which simply forwards the error onto the primary Deferred.

Lower the timeout from 10*2 seconds to 2*2 seconds.  This is an
improvement, but the test is still cumbersome to run.  Maybe tests
that depend on timeouts should be moved to their own test class,
so it's possible to run the fast tests quickly.

13 years agoFix delay_features is left after each test, causing slow tests.
Glenn Maynard [Thu, 28 Apr 2011 23:31:33 +0000 (19:31 -0400)]
Fix delay_features is left after each test, causing slow tests.

Is there any way to eliminate this?  It makes the tests using it take a
very long time, which makes running the tests a pain.

13 years agoImprove error handling when httpb_client receives a terminate.
Glenn Maynard [Thu, 28 Apr 2011 23:10:52 +0000 (19:10 -0400)]
Improve error handling when httpb_client receives a terminate.

On terminate, QueryFactory raised a failure using a raw tuple containing
the parsed stanza.  This leads to obscure error messages that look like
this:

> Traceback (most recent call last):
> Failure: __builtin__.tuple: (<twisted.words.xish.domish.Element object
> at 0x925f72c>, [<twisted.words.xish.domish.Element object at 0x9240cac>])

Stash the data in an exception class, which is what failure.Failure
expects anyway, and update the test that uses it.

(testStreamError seems to be the only place that uses this; I just ended
up cleaning it up in the process of figuring out the above error.)

Now if a <body type='terminate'> is received and printed as a failure, it
looks like this:

> Traceback (most recent call last):
> Failure: punjab.httpb_client.HTTPBNetworkTerminated: <body
> xmlns='http://jabber.org/protocol/httpbind' type='terminate' condition='remote-stream-error'/>

13 years agoFix xep124.py.testWhiteListError.
Glenn Maynard [Thu, 28 Apr 2011 22:57:25 +0000 (18:57 -0400)]
Fix xep124.py.testWhiteListError.

After the previous commit, this test was succeeding when it shouldn't.
It expected a failure, but didn't check that the error it received was
the correct one; it was receiving the wrong error, which it accepted.
Check that the returned error really is 400 Bad Request.

Also, fix the actual error: there was no route= in this test's request,
so it wasn't routed to the test server, ending up on the default port
5222 instead.

13 years agoDon't hardcode an XMPP port of 5222 in tests.
Glenn Maynard [Thu, 28 Apr 2011 20:42:29 +0000 (16:42 -0400)]
Don't hardcode an XMPP port of 5222 in tests.

Fixes tests failing when the port is in use on the system running the
tests, which is very common--this is the real XMPP port.  Specify 0 and
use the random port the OS assigns us.

13 years agoFixup importing punjab.patches.
Glenn Maynard [Thu, 28 Apr 2011 16:25:58 +0000 (12:25 -0400)]
Fixup importing punjab.patches.

Bit by Python's pyc caching; it was pulling in an old .pyc whose .py no
longer existed.

13 years agoReplace insecure SID generation.
Glenn Maynard [Thu, 28 Apr 2011 16:18:22 +0000 (12:18 -0400)]
Replace insecure SID generation.

SID generation is required to be unpredictable, but was based on
insecure input: the time, a predictable counter and a non-cryptographically-
secure PRNG.  Replace it by simply calling os.urandom to retrieve
a block of securely-random data, and using its hex representation as
the SID.

This also eliminates the other deprecation warning (the md5 module is
deprecated).

13 years agoUpdate deprecated module usage.
Glenn Maynard [Thu, 28 Apr 2011 16:08:41 +0000 (12:08 -0400)]
Update deprecated module usage.

The sha module is deprecated.  Use hashlib.sha1 instead.  This fixes a
Python warning on startup.

13 years agoReport the original stream:error stanza to clients.
Glenn Maynard [Thu, 28 Apr 2011 04:53:59 +0000 (00:53 -0400)]
Report the original stream:error stanza to clients.

When a stream:error was received, the error was parsed, converted to a
StreamError exception, then XML was recreated from that.  This is roundabout
and lossy: it's parsing the XML, then attempting to recreate the same XML
that it already had.

Instead, keep the original XML node in the exception, and use it directly.
This ensures that the <stream:error> node in remote-stream-error is
unchanged from what we received from the remote server.  Any extensions
will be passed through unchanged, as should happen for all stanzas.

For example, the <stream:error> node reported by Jabber14 now correctly
reproduces its xmlns='jabber:client' attribute.

The simple patch in patches.py should eventually be sent upstream.

13 years agoMerge branch 'black_list_3'
Christopher Zorn [Mon, 28 Mar 2011 15:04:25 +0000 (08:04 -0700)]
Merge branch 'black_list_3'

13 years agoAdd black list support to punjab.
Jack Moffitt [Sat, 26 Mar 2011 20:50:46 +0000 (14:50 -0600)]
Add black list support to punjab.

13 years agoadd prefix support for raw strings that works
Christopher tofu Zorn [Mon, 15 Nov 2010 22:00:35 +0000 (17:00 -0500)]
add prefix support for raw strings that works

13 years agoadd a cleaner way to run different tests, also some small formatting changes
Christopher tofu Zorn [Mon, 20 Sep 2010 19:50:05 +0000 (15:50 -0400)]
add a cleaner way to run different tests, also some small formatting changes

13 years agoremove debugging
Christopher tofu Zorn [Mon, 16 Aug 2010 20:47:05 +0000 (16:47 -0400)]
remove debugging

13 years agoMerge branch 'escape-xml-attributes'
Garret Heaton [Tue, 10 Aug 2010 20:15:48 +0000 (13:15 -0700)]
Merge branch 'escape-xml-attributes'

13 years agoProperly escape XML attributes for raw XML capture
Garret Heaton [Tue, 10 Aug 2010 20:00:53 +0000 (13:00 -0700)]
Properly escape XML attributes for raw XML capture

Without this fix, the raw XML will not match the original XML in the
case where XML entities are present. This can result in the sending of
invalid XML to the XMPP server.

13 years agoTerminate active BOSH sessions when stopping.
Garret Heaton [Sat, 7 Aug 2010 20:11:48 +0000 (13:11 -0700)]
Terminate active BOSH sessions when stopping.

Fixes issue #29.

14 years agotypo in year
Christopher tofu Zorn [Tue, 27 Apr 2010 20:23:25 +0000 (16:23 -0400)]
typo in year

14 years agobump copyright and add powdahound to contributors
Christopher tofu Zorn [Tue, 27 Apr 2010 20:22:23 +0000 (16:22 -0400)]
bump copyright and add powdahound to contributors

14 years agoadd tests for whitelist and a small bug fix on matches, also add support for *
Christopher tofu Zorn [Tue, 27 Apr 2010 20:16:03 +0000 (16:16 -0400)]
add tests for whitelist and a small bug fix on matches, also add support for *

14 years agoSubdomain support for white_list.
Garret Heaton [Tue, 27 Apr 2010 18:58:06 +0000 (11:58 -0700)]
Subdomain support for white_list.

14 years agoTake white_list as command line arg.
Garret Heaton [Tue, 27 Apr 2010 18:57:41 +0000 (11:57 -0700)]
Take white_list as command line arg.

14 years agoFix namespaces used when returning stream errors.
Garret Heaton [Tue, 27 Apr 2010 17:36:50 +0000 (10:36 -0700)]
Fix namespaces used when returning stream errors.

Previously, <stream:error> stanzas coming from the XMPP server would be
sent to connected clients with mangled namespaces, like so:

  <body xmlns='http://jabber.org/protocol/httpbind' type='terminate'
    condition='remote-stream-error'>
    <ns0:error xmlns:ns0='http://etherx.jabber.org/streams'>
      <system-shutdown xmlns='urn:ietf:params:xml:ns:xmpp-streams'/>
    </ns0:error>
  </body>

Now they will have correct prefixes:

  <body xmlns='http://jabber.org/protocol/httpbind' type='terminate'
    condition='remote-stream-error'>
    <stream:error xmlns:stream='http://etherx.jabber.org/streams'>
      <system-shutdown xmlns='urn:ietf:params:xml:ns:xmpp-streams'/>
    </stream:error>
  </body>

14 years agoreport ssl error when its not available
Christopher tofu Zorn [Thu, 11 Feb 2010 18:52:25 +0000 (13:52 -0500)]
report ssl error when its not available

14 years agoadd white list docs to tac file
Christopher tofu Zorn [Mon, 8 Feb 2010 16:19:51 +0000 (11:19 -0500)]
add white list docs to tac file

14 years agoadd twisted names to required dependency
Christopher tofu Zorn [Mon, 8 Feb 2010 14:25:58 +0000 (09:25 -0500)]
add twisted names to required dependency

14 years agoallow limiting servers with a white list
Christopher tofu Zorn [Mon, 8 Feb 2010 14:07:29 +0000 (09:07 -0500)]
allow limiting servers with a white list

14 years agobump up version to 0.14
Christopher tofu Zorn [Mon, 8 Feb 2010 10:56:46 +0000 (05:56 -0500)]
bump up version to 0.14

14 years agochange bosh resource path to http-bind like prosody and ejabberd
Christopher tofu Zorn [Mon, 8 Feb 2010 10:54:37 +0000 (05:54 -0500)]
change bosh resource path to http-bind like prosody and ejabberd

14 years agomake sure we always use xmpp-httpbind as the resource
Christopher tofu Zorn [Mon, 8 Feb 2010 10:45:17 +0000 (05:45 -0500)]
make sure we always use xmpp-httpbind as the resource

14 years agoadd ability to create sessions for other protocols, split xep-124 and xep-206
Christopher tofu Zorn [Mon, 8 Feb 2010 09:54:52 +0000 (04:54 -0500)]
add ability to create sessions for other protocols, split xep-124 and xep-206

14 years agoMerge branch 'flash-crossdomain-27'
Christopher tofu Zorn [Wed, 20 Jan 2010 15:17:55 +0000 (10:17 -0500)]
Merge branch 'flash-crossdomain-27'

14 years agoMerge branch 'cors-26'
Christopher tofu Zorn [Wed, 20 Jan 2010 15:15:34 +0000 (10:15 -0500)]
Merge branch 'cors-26'

14 years agoAdd crossdomain.xml to static dir to support cross-domain requests from flash.
Jack Moffitt [Wed, 20 Jan 2010 06:48:08 +0000 (23:48 -0700)]
Add crossdomain.xml to static dir to support cross-domain requests from flash.

14 years agoAdded support for W3C CORS, to allow cross-domain http bind requests from browsers.
Jack Moffitt [Wed, 20 Jan 2010 06:45:55 +0000 (23:45 -0700)]
Added support for W3C CORS, to allow cross-domain http bind requests from browsers.

14 years agoadd some debugging and remove unused code
Christopher 'Tofu' Zorn [Thu, 1 Oct 2009 20:44:11 +0000 (16:44 -0400)]
add some debugging and remove unused code

14 years agolog the raw string
Christopher 'Tofu' Zorn [Fri, 18 Sep 2009 18:37:15 +0000 (14:37 -0400)]
log the raw string

15 years agoMerge branch 'verbose_logging_fix'
Christopher 'Tofu' Zorn [Fri, 27 Feb 2009 02:31:48 +0000 (21:31 -0500)]
Merge branch 'verbose_logging_fix'

15 years agofix it so verbose is verbose and only err logs if not verbose
Christopher 'Tofu' Zorn [Fri, 27 Feb 2009 02:31:20 +0000 (21:31 -0500)]
fix it so verbose is verbose and only err logs if not verbose

15 years agosmall change to test git
Christopher 'Tofu' Zorn [Mon, 9 Feb 2009 15:57:07 +0000 (10:57 -0500)]
small change to test git

15 years agoSilenced underlying twisted logging via self.noisy.
Jack Moffitt [Sat, 17 Jan 2009 02:25:53 +0000 (19:25 -0700)]
Silenced underlying twisted logging via self.noisy.

15 years agoRemoved spurious logging.
Jack Moffitt [Sat, 17 Jan 2009 00:06:25 +0000 (17:06 -0700)]
Removed spurious logging.

15 years agoAdded .gitignore.
Jack Moffitt [Fri, 16 Jan 2009 23:48:24 +0000 (16:48 -0700)]
Added .gitignore.

15 years agoFixed logging to respect the verbosity setting.
Jack Moffitt [Fri, 16 Jan 2009 23:47:22 +0000 (16:47 -0700)]
Fixed logging to respect the verbosity setting.

15 years agoadd ability to bind to ips. re: #12
Christopher 'Tofu' Zorn [Mon, 5 Jan 2009 13:50:23 +0000 (08:50 -0500)]
add ability to bind to ips. re: #12

15 years agofix code for old bug in older twisteds, plus connect differently if we are using...
Christopher 'Tofu' Zorn [Sun, 4 Jan 2009 23:14:52 +0000 (18:14 -0500)]
fix code for old bug in older twisteds, plus connect differently if we are using localhost

15 years agofix code for old bug in older twisteds, plus connect differently if we are using...
Christopher 'Tofu' Zorn [Sun, 4 Jan 2009 23:01:53 +0000 (18:01 -0500)]
fix code for old bug in older twisteds, plus connect differently if we are using localhost

15 years agoadd patch from http://groups.google.com/group/punjab-xmpp/browse_thread/thread/8877b2...
Christopher Zorn [Wed, 3 Dec 2008 21:23:27 +0000 (21:23 +0000)]
add patch from groups.google.com/group/punjab-xmpp/browse_thread/thread/8877b2b686ff998c?hl=en re #12

15 years agoBranching to add the ability to bind a client to a socket. re #12
Christopher Zorn [Wed, 3 Dec 2008 21:17:28 +0000 (21:17 +0000)]
Branching to add the ability to bind a client to a socket. re #12

15 years agoa test
Christopher Zorn [Fri, 7 Nov 2008 00:50:47 +0000 (00:50 +0000)]
a test

15 years agochange text for a test
Christopher Zorn [Thu, 6 Nov 2008 22:44:32 +0000 (22:44 +0000)]
change text for a test

15 years agocommit test
Christopher Zorn [Thu, 6 Nov 2008 22:25:18 +0000 (22:25 +0000)]
commit test

15 years agocommit test
Christopher Zorn [Thu, 6 Nov 2008 22:14:58 +0000 (22:14 +0000)]
commit test

15 years agocommit test
Christopher Zorn [Thu, 6 Nov 2008 22:09:50 +0000 (22:09 +0000)]
commit test

15 years agoadd tests to distro
Christopher Zorn [Fri, 19 Sep 2008 18:23:40 +0000 (18:23 +0000)]
add tests to distro

15 years agofix for punjab tests from anywhere
Nathan Zorn [Fri, 19 Sep 2008 18:15:04 +0000 (18:15 +0000)]
fix for punjab tests from anywhere

15 years agomerge in url changes and version update from source:/branches/version-0.13-10
Nathan Zorn [Fri, 19 Sep 2008 18:06:23 +0000 (18:06 +0000)]
merge in url changes and version update from source:/branches/version-0.13-10

15 years agomoving stuff around
Christopher Zorn [Fri, 19 Sep 2008 16:00:12 +0000 (16:00 +0000)]
moving stuff around

15 years agomoving stuff around
Christopher Zorn [Fri, 19 Sep 2008 15:59:28 +0000 (15:59 +0000)]
moving stuff around

15 years agomoving stuff around
Christopher Zorn [Fri, 19 Sep 2008 15:59:28 +0000 (15:59 +0000)]
moving stuff around

15 years agoRemoved merge tracking for "svnmerge" for
Jack Moffitt [Fri, 19 Sep 2008 15:53:30 +0000 (15:53 +0000)]
Removed merge tracking for "svnmerge" for
https://code.stanziq.com/svn/punjab/branches/timeout-test-5

15 years agoMerged revisions 9,17-20 via svnmerge from
Jack Moffitt [Fri, 19 Sep 2008 15:52:58 +0000 (15:52 +0000)]
Merged revisions 9,17-20 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/timeout-test-5

........
  r9 | tofu | 2008-09-18 07:48:00 -0600 (Thu, 18 Sep 2008) | 1 line

  test is not complete, just saving
........
  r17 | tofu | 2008-09-18 15:26:16 -0600 (Thu, 18 Sep 2008) | 1 line

  fix inactivity and add a timeout test
........
  r18 | tofu | 2008-09-18 16:54:57 -0600 (Thu, 18 Sep 2008) | 1 line

  test for terminate too
........
  r19 | tofu | 2008-09-19 08:05:55 -0600 (Fri, 19 Sep 2008) | 1 line

  alter the tests a bit
........
  r20 | tofu | 2008-09-19 08:44:19 -0600 (Fri, 19 Sep 2008) | 1 line

  dont use jabber
........

15 years agoMerged revisions 9,17-20 via svnmerge from
Jack Moffitt [Fri, 19 Sep 2008 15:52:58 +0000 (15:52 +0000)]
Merged revisions 9,17-20 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/timeout-test-5

........
  r9 | tofu | 2008-09-18 07:48:00 -0600 (Thu, 18 Sep 2008) | 1 line

  test is not complete, just saving
........
  r17 | tofu | 2008-09-18 15:26:16 -0600 (Thu, 18 Sep 2008) | 1 line

  fix inactivity and add a timeout test
........
  r18 | tofu | 2008-09-18 16:54:57 -0600 (Thu, 18 Sep 2008) | 1 line

  test for terminate too
........
  r19 | tofu | 2008-09-19 08:05:55 -0600 (Fri, 19 Sep 2008) | 1 line

  alter the tests a bit
........
  r20 | tofu | 2008-09-19 08:44:19 -0600 (Fri, 19 Sep 2008) | 1 line

  dont use jabber
........

15 years agoInitialized merge tracking via "svnmerge" with revisions "1-8" from
Jack Moffitt [Fri, 19 Sep 2008 15:50:21 +0000 (15:50 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-8" from
https://code.stanziq.com/svn/punjab/branches/timeout-test-5

15 years agoRemoved merge tracking for "svnmerge" for
Jack Moffitt [Thu, 18 Sep 2008 15:45:39 +0000 (15:45 +0000)]
Removed merge tracking for "svnmerge" for
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6

15 years agoMerged revisions 4-7,10-13 via svnmerge from
Jack Moffitt [Thu, 18 Sep 2008 15:45:12 +0000 (15:45 +0000)]
Merged revisions 4-7,10-13 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6

........
  r4 | tofu | 2008-09-17 13:55:35 -0600 (Wed, 17 Sep 2008) | 1 line

  make methods and clean up code
........
  r5 | tofu | 2008-09-17 14:29:48 -0600 (Wed, 17 Sep 2008) | 1 line

  change appending waiting_requests and fix a typo
........
  r6 | tofu | 2008-09-17 14:36:55 -0600 (Wed, 17 Sep 2008) | 1 line

  more fixes
........
  r7 | tofu | 2008-09-17 14:51:04 -0600 (Wed, 17 Sep 2008) | 1 line

  fix typo
........
  r10 | tofu | 2008-09-18 07:56:26 -0600 (Thu, 18 Sep 2008) | 1 line

  no need for if statement and change the way we handle too many holds
........
  r11 | tofu | 2008-09-18 08:05:07 -0600 (Thu, 18 Sep 2008) | 1 line

  just use _wrPop when we need to return blanks
........
  r12 | tofu | 2008-09-18 08:15:16 -0600 (Thu, 18 Sep 2008) | 1 line

  make a clearWaitingRequests method and do some more clean up
........
  r13 | tofu | 2008-09-18 08:41:30 -0600 (Thu, 18 Sep 2008) | 1 line

  add a comment
........

15 years agoMerged revisions 4-7,10-13 via svnmerge from
Jack Moffitt [Thu, 18 Sep 2008 15:45:12 +0000 (15:45 +0000)]
Merged revisions 4-7,10-13 via svnmerge from
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6

........
  r4 | tofu | 2008-09-17 13:55:35 -0600 (Wed, 17 Sep 2008) | 1 line

  make methods and clean up code
........
  r5 | tofu | 2008-09-17 14:29:48 -0600 (Wed, 17 Sep 2008) | 1 line

  change appending waiting_requests and fix a typo
........
  r6 | tofu | 2008-09-17 14:36:55 -0600 (Wed, 17 Sep 2008) | 1 line

  more fixes
........
  r7 | tofu | 2008-09-17 14:51:04 -0600 (Wed, 17 Sep 2008) | 1 line

  fix typo
........
  r10 | tofu | 2008-09-18 07:56:26 -0600 (Thu, 18 Sep 2008) | 1 line

  no need for if statement and change the way we handle too many holds
........
  r11 | tofu | 2008-09-18 08:05:07 -0600 (Thu, 18 Sep 2008) | 1 line

  just use _wrPop when we need to return blanks
........
  r12 | tofu | 2008-09-18 08:15:16 -0600 (Thu, 18 Sep 2008) | 1 line

  make a clearWaitingRequests method and do some more clean up
........
  r13 | tofu | 2008-09-18 08:41:30 -0600 (Thu, 18 Sep 2008) | 1 line

  add a comment
........

15 years agoInitialized merge tracking via "svnmerge" with revisions "1-3" from
Jack Moffitt [Thu, 18 Sep 2008 15:43:12 +0000 (15:43 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-3" from
https://code.stanziq.com/svn/punjab/branches/abstract-waiting-requests-6

15 years agoimporting punjab, no need for history
Christopher Zorn [Tue, 16 Sep 2008 18:46:36 +0000 (18:46 +0000)]
importing punjab, no need for history

15 years agoimporting punjab, no need for history
Christopher Zorn [Tue, 16 Sep 2008 18:46:36 +0000 (18:46 +0000)]
importing punjab, no need for history