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

706 Коммитов

Автор SHA1 Сообщение Дата
Robert Jordan a60258501e merged from head
svn path=/branches/robertj/xsp/; revision=88340
2007-10-28 01:52:16 +00:00
Robert Jordan 12acc6fff1 2007-10-28 Robert Jordan <robertj@gmx.net>
* src/Mono.WebServer.FastCgi/ConfigurationManager.*:
	Implement an additional configuration source: environment.

	* src/Mono.WebServer.FastCgi/Request.cs:
	Take directory index (default documents) into account.

svn path=/branches/robertj/xsp/; revision=88339
2007-10-28 01:34:31 +00:00
Robert Jordan 8dc70d3b31 svn props
svn path=/branches/robertj/xsp/; revision=88337
2007-10-27 23:25:29 +00:00
Robert Jordan a0646039f3 2007-10-28 Robert Jordan <robertj@gmx.net>
* src/Mono.WebServer.FastCgi/Request.cs:
	Compute PATH_INFO, PATH_TRANSLATED, SCRIPT_NAME,
	SCRIPT_FILENAME when running under Apache.


svn path=/branches/robertj/xsp/; revision=88336
2007-10-27 23:24:31 +00:00
Wade Berrier 1e3727fd3d 2007-10-26 Wade Berrier <wberrier@novell.com>
* configure.in:
       * src/AssemblyInfoModMono.cs.in:
       * src/AssemblyInfo.cs.in:
       * tools/asp_state/AssemblyInfo.cs.in:
       * tools/dbsessmgr/AssemblyInfo.cs.in:
       Split VERSION to VERSION and XSP_VERSION in order to allow svn
revision 
       in VERSION and still satisfy mcs's numbering scheme (recently
changed
       to match csc)
       Didn't replace VERSION, because we need the tarball version to
not have
       periods in the revision name.


svn path=/trunk/xsp/; revision=88287
2007-10-26 20:24:25 +00:00
Marek Habersack 58ee9426f0 2007-10-24 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer/XSPWorkerRequest.cs: gracefully handle
	exceptions in the constructor, by closing the connection when
	Exception happens.

svn path=/trunk/xsp/; revision=88106
2007-10-24 18:11:15 +00:00
Robert Jordan 78591c8c20 2007-10-22 Robert Jordan <robertj@gmx.net>
* man/*: Generate fastcgi-mono-server(1).
	* doc/*: Temporarily fix for `make distcheck'.
	* src/Mono.WebServer.FastCgi/Makefile.am: Cleanups.

svn path=/branches/robertj/xsp/; revision=87905
2007-10-22 13:01:36 +00:00
Robert Jordan 47f6d1f0e6 flush
svn path=/branches/robertj/xsp/; revision=87884
2007-10-22 00:53:27 +00:00
Robert Jordan 6205522f35 Typo
svn path=/branches/robertj/xsp/; revision=87882
2007-10-22 00:38:20 +00:00
Robert Jordan 2931732a91 2007-10-22 Robert Jordan <robertj@gmx.net>
* src/*/*.am : Fix `make distclean'.

svn path=/branches/robertj/xsp/; revision=87881
2007-10-22 00:37:52 +00:00
Robert Jordan 7ea28d2e41 In src:
In .:
	* src/Mono.WebServer.FastCgi/Request.cs:
	Reverted temporary hack for mod_fastcgi.
	* src/Mono.WebServer.FastCgi/ConfigurationManager.cs:
	The XML default settings have less precedence.
	
2007-10-22  Robert Jordan  <robertj@gmx.net>

	* src/Mono.WebServer.Apache/Mono.WebServer.Apache.sources: Create.
	* src/Mono.WebServer.Apache/SecurityConfiguration.cs:
	Get rid of MODMONO.

2007-10-22  Robert Jordan  <robertj@gmx.net>

	* src/Makefile.am: FastCGI -> FastCgi.

	* src/Mono.WebServer.FastCgi/Makefile.am:
	* src/Mono.WebServer.FastCgi/*.sources:
	* src/Mono.WebServer.FastCgi/AssemblyInfo.cs.in:
	Create.
	
	* src/Mono.WebServer.FastCgi/ConfigurationManager.xml:
	Add some default values to be able to get rid of
	the exe.config file. Comment out the automapping settings.
	
	* src/Mono.WebServer.FastCgi/ConfigurationManager.cs:
	Implement ImportSettings (). Support for default settings
	specified in ConfigurationManaged.xml.
	
	* src/Mono.WebServer.FastCgi/main.cs:
	* src/Mono.WebServer.FastCgi/Responder.cs:
	Take the ApplicationManager
	out of the build until its automapping issues are fixed.
	
	* src/Mono.WebServer.FastCgi/server.cs: Rename to main.cs

2007-10-22  Robert Jordan  <robertj@gmx.net>

	* src/Mono.WebServer.FastCgi: Import Brian's files from his google
	repository. Flatten hierarchies to adhere to mono's standards.
	Disintegrate the Mono.FastCgi assembly.

2007-10-22  Robert Jordan  <robertj@gmx.net>

	* configure.in, scripts/Makefile.am: Reflect changes.
	* src/Makefile.am: Reflect changes.
	* src/Mono.WebServer.Apache/main.cs: Remove XSP-related code.
	* src/Mono.WebServer.XSP/main.cs: Remove ModMono-related code.
	* src/Mono.WebServer.Apache/Makefile.am: Create from .Makefile.am.
	* src/Mono.WebServer.XSP/Makefile.am: Create from Makefile.am.
	* src/server.cs: Copy as main.cs to Mono.WebServer.Apache and
	Mono.WebServer.XSP
	* src/ecurity.cs: Move to Mono.WebServer.XSP/SecurityConfiguration.cs
	* src/ModMono*.cs: Move to Mono.WebServer.Apache.
	* src/Mono.WebServer.Apache: Create.
	* src/Mono.WebServer.FastCgi: Create.
	* src/Mono.WebServer.XSP: Create.


svn path=/branches/robertj/xsp/; revision=87880
2007-10-21 23:18:48 +00:00
Robert Jordan 1ad6edb05c 2007-10-22 Robert von Donop <robertj@shiba-suse10.css.de>
* Mono.WebServer.Apache/Mono.WebServer.Apache.sources: Create.
	* Mono.WebServer.Apache/SecurityConfiguration.cs:
	Get rid of MODMONO.


svn path=/branches/robertj/xsp/; revision=87878
2007-10-21 22:43:54 +00:00
Robert Jordan 0b827ddff7 2007-10-22 Robert Jordan <robertj@gmx.net>
* Makefile.am: FastCGI -> FastCgi.

	* Mono.WebServer.FastCgi/Makefile.am:
	* Mono.WebServer.FastCgi/*.sources:
	* Mono.WebServer.FastCgi/AssemblyInfo.cs.in:
	Create.
	
	* Mono.WebServer.FastCgi/ConfigurationManager.xml:
	Add some default values to be able to get rid of
	the exe.config file. Comment out the automapping settings.
	
	* Mono.WebServer.FastCgi/ConfigurationManager.cs:
	Implement ImportSettings (). Support for default settings
	specified in ConfigurationManaged.xml.
	
	* Mono.WebServer.FastCgi/main.cs:
	* Mono.WebServer.FastCgi/Responder.cs:
	Take the ApplicationManager
	out of the build until its automapping issues are fixed.
	
	* Mono.WebServer.FastCgi/server.cs: Rename to main.cs


svn path=/branches/robertj/xsp/; revision=87877
2007-10-21 22:39:07 +00:00
Robert Jordan 507c171723 This file was missed in the previous commit.
svn path=/branches/robertj/xsp/; revision=87876
2007-10-21 22:26:08 +00:00
Robert Jordan 1337108fc6 2007-10-22 Robert Jordan <robertj@gmx.net>
* Mono.WebServer.FastCgi: Import Brian's files from his google
	repository. Flatten hierarchies to adhere to mono's standards.
	Disintegrate the Mono.FastCgi assembly.


svn path=/branches/robertj/xsp/; revision=87875
2007-10-21 22:21:35 +00:00
Robert Jordan 8781bc8990 In src:
2007-10-22  Robert Jordan  <robertj@gmx.net>

	* Makefile.am: Reflect changes.
	* Mono.WebServer.Apache/main.cs: Remove XSP-related code.
	* Mono.WebServer.XSP/main.cs: Remove ModMono-related code.
	* Mono.WebServer.Apache/Makefile.am: Create from .Makefile.am.
	* Mono.WebServer.XSP/Makefile.am: Create from Makefile.am.
	* server.cs: Copy as main.cs to Mono.WebServer.Apache and
	Mono.WebServer.XSP
	* security.cs: Move to Mono.WebServer.XSP/SecurityConfiguration.cs
	* ModMono*.cs: Move to Mono.WebServer.Apache.
	* Mono.WebServer.Apache: Create.
	* Mono.WebServer.FastCgi: Create.
	* Mono.WebServer.XSP: Create.
In .:
2007-10-22  Robert Jordan  <robertj@gmx.net>

	* configure.in, scripts/Makefile.am:
	 Reflect src changes (fastcgi integration).


svn path=/branches/robertj/xsp/; revision=87874
2007-10-21 22:09:08 +00:00
Juraj Skripsky 9f405db549 2007-10-03 Juraj Skripsky <js@hotfeet.ch>
* src/ModMonoRequest.cs: put the ModMonoConfig struct in charge to
	tracking its property "Changed".

svn path=/trunk/xsp/; revision=86808
2007-10-03 13:58:02 +00:00
Marek Habersack 8501707f03 2007-10-03 Marek Habersack <mhabersack@novell.com>
* src/ModMonoRequestBroker.cs,src/ModMonoWorker.cs: added a method
	to support configuration of output buffering in mod_mono

	* src/ModMonoRequest.cs: added support for new mod_mono
	communication protocol, SET_CONFIGURATION. Configuration of
	mod_mono is updated before write commands, if necessary. Currently
	it supports only configuring the output buffering (based on the
	value of HttpResponse.BufferOutput)
	Bumped protocol version to 8

	* src/ModMonoWorkerRequest.cs: added a method which updates the
	mod_mono/apache configuration if necessary.

svn path=/trunk/xsp/; revision=86803
2007-10-03 12:23:20 +00:00
Marek Habersack 8eaeebbeec 2007-10-02 Marek Habersack <mhabersack@novell.com>
* src/ModMonoRequest.cs: make the protocol mismatch error message
	more informative.

svn path=/trunk/xsp/; revision=86744
2007-10-02 13:10:40 +00:00
Marek Habersack c0a1da9a04 2007-09-21 Marek Habersack <mhabersack@novell.com>
* src/ModMonoRequest.cs: use UTF8 when sending strings to
            Apache. Fixes bug #325448

svn path=/trunk/xsp/; revision=86156
2007-09-21 16:31:40 +00:00
Daniel Nauck a139575a74 2007-09-18 Daniel Nauck <dna@mono-project.de>
* src/server.cs: add a UnhandledExceptionEventHandler
        to handle an exception that is not handled by the application domain.


svn path=/trunk/xsp/; revision=85969
2007-09-18 14:00:39 +00:00
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