Граф коммитов

635 Коммитов

Автор SHA1 Сообщение Дата
Marek Habersack a6ade495a9 2007-08-18 Josh Tauberer <jit@occams.info>
* src/Mono.WebServer/BaseRequestBroker.cs: Correct a mistake
            in my previous patch: checking for wrap-around on requests_served
            counter, since we bitmask it 0x7FFF, wrap-around occurs at 0x8000.

svn path=/trunk/xsp/; revision=84355
2007-08-18 20:47:28 +00:00
Wade Berrier 7bf024de47 version bump-> 1.2.5
svn path=/trunk/xsp/; revision=84232
2007-08-16 19:43:53 +00:00
Marek Habersack 8fc389be41 2007-08-14 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/XSPWorker.cs: do not rethrow an exception
	that might occur on write, write an error message to the console
	and close our end of the connection instead. Fixes bug #81699

svn path=/trunk/xsp/; revision=84059
2007-08-14 12:18:34 +00:00
Marek Habersack 3f9b9fd469 2007-08-14 Marek Habersack <mhabersack@novell.com>
* src/ModMonoWorkerRequest.cs: ReadEntityBody makes sure the
	number of bytes to copy is > 0 and that the read buffer is not
	null.

svn path=/trunk/xsp/; revision=84028
2007-08-14 07:50:12 +00:00
Marek Habersack 95e112e9a8 2007-08-09 Marek Habersack <mhabersack@novell.com>
* src/ModMonoWorkerRequest.cs,
	src/Mono.WebServer/XSPWorkerRequest.cs: do not fail if default
	index files configuration cannot be retrieved. Based on patch from
	Juraj Skripsky <juraj@hotfeet.ch>, thanks! Fixes bug #82379.

svn path=/trunk/xsp/; revision=83730
2007-08-09 10:38:44 +00:00
Marek Habersack d91dfc1b38 2007-08-09 Marek Habersack <mhabersack@novell.com>
* src/ModMonoWorker.cs: move request unregister call from the
	finally block to the catch block. This is to avoid unregistering
	the request while it is still being processed by the HttpRuntime
	(asynchronously). Patch from Joshua Tauberer <jit@occams.info>,
	thanks!

svn path=/trunk/xsp/; revision=83717
2007-08-09 08:28:12 +00:00
Marek Habersack d53b48b9d7 Make complains about trailing whitespace
svn path=/trunk/xsp/; revision=83661
2007-08-08 12:39:01 +00:00
Marek Habersack 54977be664 2007-08-08 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/MonoWorkerRequest.cs: don't use the
	SendResponseFromFile (IntPtr, long, long) overload from the
	SendResponseFromFile (string, long, long) one - prevents double
	close of the file handle.

svn path=/trunk/xsp/; revision=83660
2007-08-08 11:55:20 +00:00
Marek Habersack de755a1e29 2007-08-08 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/ApplicationServer.cs: leave only the
	implementation of the ApplicationServer class here, the other
	classes are moved to own files, below.

	* src/Mono.WebServer/Paths.cs: new file, moved Paths class
	implementation here.

	* src/Mono.WebServer/HttpErrors.cs: new file, moved HttpErrors
	class implementation here.

	* src/Mono.WebServer/VPathToHost.cs: new file, moved VPathToHost
	class implementation here.

svn path=/trunk/xsp/; revision=83643
2007-08-08 09:02:52 +00:00
Marek Habersack 45d2074608 2007-08-08 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/XSPApplicationHost.cs: leave only the
	implementation of the XSPApplicationHost here, the other classes
	are moved to own files, below.

	* src/Mono.WebServer/XSPWorker.cs: new file, moved XSPWorker class
	implementation here.

	* src/Mono.WebServer/XSPWebSource.cs: new file, moved XSPWebSource
	class implementation here.

	* src/Mono.WebServer/XSPRequestBroker.cs: new file, moved
	XSPRequestBroker class implementation here.

	* src/Mono.WebServer/Makefile.am (monowebserver_sources): added
	new source files.

	* src/ModMonoApplicationHost.cs: leave only the implementation of
	the ModMonoApplicationHost class here, the other classes are moved
	to own files, below.

	* src/ModMonoWorker.cs: new file, moved ModMonoWorker class
	implementation here.

	* src/ModMonoWebSource.cs: new file, moved ModMonoWebSource class
	implementation here.

	* src/ModMonoRequestBroker.cs: new file, moved
	ModMonoRequestBroker class implementation here.
	
	* src/Makefile.am (modmono_only): added new source files.

svn path=/trunk/xsp/; revision=83642
2007-08-08 08:47:27 +00:00
Marek Habersack 6950202f2d restore GetWorker call in Read
svn path=/trunk/xsp/; revision=83579
2007-08-07 11:41:25 +00:00
Marek Habersack 5bfd9ab1f9 2007-08-07 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseRequestBroker.cs: applied patch by Joshua
	Tauberer (with minor changes) proposed in bug #82057. The change
	turns request id into a compound of the unique request id in the
	upper 16 bits and the index into request array in the lower 16
	bits.

	* src/Mono.WebServer/BaseApplicationHost.cs: fixed documentation.

svn path=/trunk/xsp/; revision=83570
2007-08-07 09:25:58 +00:00
Marek Habersack 29445fb26e 2007-08-06 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseApplicationHost.cs: added some more
	documentation.

	* src/Mono.WebServer/BaseRequestBroker.cs: call the
	UnregisterRequest handlers before freeing the request data.

svn path=/trunk/xsp/; revision=83528
2007-08-06 12:20:46 +00:00
Marek Habersack 96baaf53d2 temporary checkin for bug demonstration
svn path=/trunk/xsp/; revision=82146
2007-07-17 22:29:45 +00:00
Marek Habersack 7e771ba547 2007-07-17 Marek Habersack <mhabersack@novell.com>
* src/ModMonoApplicationHost.cs: it's somewhat better to
	unregister an event handler when it's not needed :P

svn path=/trunk/xsp/; revision=82083
2007-07-17 09:57:48 +00:00
Marek Habersack 5613e6cd5f 2007-07-16 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseRequestBroker.cs: added an event fired
	when the request has just been unregistered.

	* src/ModMonoApplicationHost.cs: add an event handler for the
	UnregisterRequest event in the request broker to make sure that
	the same request is never unregistered twice.

svn path=/trunk/xsp/; revision=82030
2007-07-16 13:12:39 +00:00
Wade Berrier e2c5701062 * configure.in:
* docs/Makefile.am: empty file so that this dir gets included
so we can build from a tarball


svn path=/trunk/xsp/; revision=81669
2007-07-09 20:56:30 +00:00
Marek Habersack bf414b8f34 2007-06-22 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/MonoWorkerRequest.cs: docs from Brian
	Nickel.

svn path=/trunk/xsp/; revision=80543
2007-06-22 12:24:35 +00:00
Marek Habersack 78015e1fa6 2007-06-22 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/IWebSource.cs: more docs from Brian Nickel.

svn path=/trunk/xsp/; revision=80542
2007-06-22 12:22:39 +00:00
Marek Habersack 659863f1a1 2007-06-22 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/IApplicationHost.cs: more docs from Brian
	Nickel.

svn path=/trunk/xsp/; revision=80541
2007-06-22 12:21:33 +00:00
Marek Habersack 2beb649f5a 2007-06-22 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/Makefile.am (MCSFLAGS): extract xml docs.

svn path=/trunk/xsp/; revision=80540
2007-06-22 12:18:04 +00:00
Marek Habersack 97f4494c01 2007-06-22 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseRequestBroker.cs: add some
	documentation and avoid reallocating request buffers. Patch from
	Brian Nickel <brian.nickel@gmail.com>, thanks!


svn path=/trunk/xsp/; revision=80539
2007-06-22 12:09:35 +00:00
Marek Habersack b653480583 2007-06-22 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseApplicationHost.cs: do not assume that
	requestBroker is not null and that it is
	BaseRequestBroker. Modified patch from Brian Nickel
	<brian.nickel@gmail.com>, thanks!

svn path=/trunk/xsp/; revision=80538
2007-06-22 11:55:12 +00:00
Marek Habersack 8834536ccc 2007-06-20 Marek Habersack <mhabersack@novell.com>
* src/ModMonoRequest.cs: added support for virtual hosts
	(ServerAlias) Patch from Juraj Skripsky
	<juraj@hotfeet.ch>, thanks! Closes bug #81878.
	* src/ModMonoApplicationHost.cs: as above

svn path=/trunk/xsp/; revision=80295
2007-06-20 07:36:19 +00:00
Marek Habersack 1d7c138f3a 2007-06-15 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/ApplicationServer.cs: do not skip checking
	the path when vhost is '*'. Patch from Brian Nickel
	<brian.nickel@gmail.com>, thanks!

svn path=/trunk/xsp/; revision=79645
2007-06-14 23:35:00 +00:00
Wade Berrier 82eccc341b 2007-05-06 Wade Berrier <wberrier@novell.com>
* tools/asp_state/Makefile.am:
        * tools/dbsessmgr/Makefile.am: 
        Split DATA and SCRIPTS for .exe and .exe.config so that .config doesn't
        have the execute bit set (otherwise, causes warning in suse's rpmlint)


svn path=/trunk/xsp/; revision=78907
2007-06-07 23:56:48 +00:00
Marek Habersack 0d69f78597 2007-05-04 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/MonoWorkerRequest.cs: avoid possible NOR.

svn path=/trunk/xsp/; revision=76722
2007-05-04 19:53:09 +00:00
Marek Habersack 93ef737325 2007-04-24 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseApplicationHost.cs: put the worker's
	ProcessRequest in try/catch in order to handle uncaught exceptions
	more gracefully.

	* src/Mono.WebServer/MonoWorkerRequest.cs: more robust exception
	handling. We no longer leave the connection open and the browser
	spinning after an early exception (e.g. configuration exception
	while reading the top-level web.config file) ocurred.


svn path=/trunk/xsp/; revision=76164
2007-04-24 07:00:08 +00:00
Wade Berrier e159ddddbd version bump -> 1.2.4
svn path=/trunk/xsp/; revision=75986
2007-04-20 01:40:04 +00:00
Marek Habersack 9e599b0ed3 2007-04-13 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseRequestBroker.cs: replace old code that
	used hashtables to store request data with arrays. Array is also
	used to acquire a unique request id. Previously the code used
	GetHashCode() to do that, incorrectly assuming that the return
	value from the method is unique. This caused frequent race
	conditions and crashes. The new code uses arrays sized at 200
	slots initially - this means it can handle up to 200 _concurrent_
	requests before it needs to resize the arrays.

	* src/Mono.WebServer/XSPApplicationHost.cs: make sure worker is
	not null before attempting to use it.

	* src/ModMonoApplicationHost.cs: make sure worker is not null
	before attempting to use it.


svn path=/trunk/xsp/; revision=75696
2007-04-13 21:53:14 +00:00
Miguel de Icaza 505fb9fd6b Revert patch 75192, we should find the real source of the problem
svn path=/trunk/xsp/; revision=75231
2007-03-30 19:28:33 +00:00
Marek Habersack a2613b44df Remove the comment as not valid
svn path=/trunk/xsp/; revision=75223
2007-03-30 18:17:52 +00:00
Marek Habersack 30f6a730fa Change the way nested Leave/Enter calls are handled.
svn path=/trunk/xsp/; revision=75194
2007-03-30 13:36:47 +00:00
Marek Habersack 4c3d650f23 2007-03-30 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/BaseRequestBroker.cs: protect access to the
	buffer in Read at least a bit. It can still be released by some
	other thread after or during Read.

svn path=/trunk/xsp/; revision=75192
2007-03-30 13:28:55 +00:00
Marek Habersack 5c8679468f 2007-03-30 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/Tracing.cs: added a utility class to help in
	tracing.

	* src/Mono.WebServer/Makefile.am (monowebserver_sources): added Tracing.cs

	* configure.in: Define TRACE together with WEBTRACE.

svn path=/trunk/xsp/; revision=75182
2007-03-30 10:34:40 +00:00
Marek Habersack 8625aa95e6 2007-03-30 Marek Habersack <mhabersack@novell.com>
* src/server.cs: move a line of common code out of ifdefs


svn path=/trunk/xsp/; revision=75180
2007-03-30 09:07:21 +00:00
Marek Habersack 4fba9e35e3 2007-03-30 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/Makefile.am (MCSFLAGS): support tracing if
	enabled.

	* src/Makefile.am (MCSFLAGS): support tracing if enabled

	* configure.in: add a parameter to enable conditional tracing.


svn path=/trunk/xsp/; revision=75179
2007-03-30 07:30:49 +00:00
Miguel de Icaza 3f53807bd4 2007-03-29 Miguel de Icaza <miguel@novell.com>
* src/ModMonoApplicationHost.cs: Do not try to call Close on a
	null stream (Stream can become null inside InnerRun) and this
	makes debugging with gdb harder. 

svn path=/trunk/xsp/; revision=75144
2007-03-29 14:53:07 +00:00
Miguel de Icaza dbb64f1de7 2007-03-28 Miguel de Icaza <miguel@novell.com>
* src/ModMonoRequest.cs: Only compute the data once.

	(GetClientBlock): if we get a -1, return the -1 to the client, do
	not try to call Read. 

svn path=/trunk/xsp/; revision=75120
2007-03-29 01:33:25 +00:00
Marek Habersack f74ba62fd0 2007-03-29 Marek Habersack <mhabersack@novell.com>
* src/ModMonoApplicationHost.cs: make sure request id is reset to
	-1 after we have unregistered it.


svn path=/trunk/xsp/; revision=75118
2007-03-28 22:05:08 +00:00
Wade Berrier 945fbfa422 * configure.in:
* src/Mono.WebServer/xsp-2.pc.in:
* src/Mono.WebServer/xsp.pc.in:
Use VERSION from configure.in in the .pc files (they were always
0.1 and 0.2 before, but this isn't useful since the files 
are xsp and xsp-2)


svn path=/trunk/xsp/; revision=73654
2007-03-02 20:15:06 +00:00
Miguel de Icaza b0da699617 Update
svn path=/trunk/xsp/; revision=71795
2007-01-27 19:45:44 +00:00
Wade Berrier e09e5bdfce Oops, fix ChangeLog date
svn path=/trunk/xsp/; revision=71692
2007-01-25 17:29:40 +00:00
Wade Berrier 00e913dbc0 * configure.in: version bump -> 1.2.3
svn path=/trunk/xsp/; revision=71683
2007-01-25 17:13:32 +00:00
Sebastien Pouliot 513773e993 In Tests.XSP.Security:
2007-01-08  Sebastien Pouliot  <sebastien@ximian.com>

	* ChangeLog: Track changes in tests.
	* Makefile: Build/run unit tests.
	* FileExtensionsTest.cs: Tests that try, by messing with the file 
	extensions, to retrieve the original source code of the web page.
	* DirectoryTraversalTest.cs: Tests that try, by messing with the path,
	to retrieve a file outside the webroot.
	* WebTestHelper.cs: Base class with helper methods for tests.

In .:
2007-01-08  Sebastien Pouliot  <sebastien@ximian.com>

	* webroot/*: Web files used for the tests.
	* NOACCESS: Test file that resides outside the web root directory.
	* README: Instruction about how to run the tests.

svn path=/trunk/xsp/; revision=70662
2007-01-08 16:40:57 +00:00
Marek Habersack d7704d0d0b Implement output header encoding support
svn path=/trunk/xsp/; revision=70560
2007-01-05 21:29:24 +00:00
Gonzalo Paniagua Javier 85af34c327 2006-12-23 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* src/Mono.WebServer/ApplicationServer.cs: set the server as stopped
	early on to prevent a possible nullref. Closes bug #80230.


svn path=/trunk/xsp/; revision=70003
2006-12-23 19:35:29 +00:00
Miguel de Icaza e9fe780e53 Improve manual page
svn path=/trunk/xsp/; revision=68230
2006-11-21 00:32:50 +00:00
Wade Berrier 291fd31128 version bump -> 1.2.1
svn path=/trunk/xsp/; revision=68079
2006-11-17 18:50:57 +00:00
Gonzalo Paniagua Javier b6b8c071b5 2006-11-16 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* src/Mono.WebServer/XSPWorkerRequest.cs: close the connection if
	there's an error reading the headers (including assembly loading
	exceptions due to a bad installation).

	* src/ModMonoApplicationHost.cs: kill the warning that everyone is
	worried about.


svn path=/trunk/xsp/; revision=68041
2006-11-16 23:26:16 +00:00