Hello community,
here is the log from the commit of package apache2-mod_mono
checked in at Fri Aug 3 20:34:39 CEST 2007.
--------
--- apache2-mod_mono/apache2-mod_mono.changes 2007-06-08 02:31:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/apache2-mod_mono/apache2-mod_mono.changes 2007-08-03 18:24:33.873947000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 3 18:21:18 CEST 2007 - wberrier@suse.de
+
+- Update to 1.2.5
+ -Error logging
+ -support for ServerAlias directive
+
+-------------------------------------------------------------------
Old:
----
mod_mono-1.2.4.tar.bz2
New:
----
mod_mono-1.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_mono.spec ++++++
--- /var/tmp/diff_new_pack.h21537/_old 2007-08-03 20:30:32.000000000 +0200
+++ /var/tmp/diff_new_pack.h21537/_new 2007-08-03 20:30:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package apache2-mod_mono (Version 1.2.4)
+# spec file for package apache2-mod_mono (Version 1.2.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,7 +20,7 @@
License: The Apache Software License
Group: Productivity/Networking/Web/Servers
Autoreqprov: on
-Version: 1.2.4
+Version: 1.2.5
Release: 1
Summary: Run ASP.NET Pages on Unix with Apache and Mono
Source: %{modname}-%{version}.tar.bz2
@@ -39,7 +39,7 @@
%endif
%endif
############### redhat based options
-%if 0%{?fedora_version}
+%if 0%{?fedora_version} || 0%{?rhel_version}
BuildRequires: httpd-devel pkgconfig
Requires: httpd
%endif
@@ -53,7 +53,7 @@
%prep
-%setup -n %{modname}-%{version}
+%setup -n %{modname}-%{version} -q
%build
%configure
@@ -69,9 +69,13 @@
%defattr(-,root,root)
%{apache2_libexecdir}/*
%{apache2_sysconfdir}/*
-%{_prefix}/share/man/man8/mod_mono.8.gz
+%{_mandir}/man8/mod_mono.8*
%changelog
+* Fri Aug 03 2007 - wberrier@suse.de
+- Update to 1.2.5
+ -Error logging
+ -support for ServerAlias directive
* Tue Jun 05 2007 - wberrier@novell.com
- Update to 1.2.4
-Connection cancellation fixes
++++++ mod_mono-1.2.4.tar.bz2 -> mod_mono-1.2.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.2.4/ChangeLog new/mod_mono-1.2.5/ChangeLog
--- old/mod_mono-1.2.4/ChangeLog 2007-04-20 06:15:26.000000000 +0200
+++ new/mod_mono-1.2.5/ChangeLog 2007-07-25 01:21:11.000000000 +0200
@@ -1,3 +1,23 @@
+2007-07-24 Wade Berrier
+
+ * configure.in: Version bump -> 1.2.5
+
+2007-07-14 Marek Habersack
+
+ * src/mod_mono.c (do_command): added error logging
+ (write_data): as above
+ (read_data): as above
+
+ * src/mod_mono.h (STATCODE_AND_SERVER): new macro to add support
+ for non-zero status codes (the status code is ignored for Apache <
+ 2.0).
+
+2007-06-20 Marek Habersack
+
+ * src/mod_mono.c (send_initial_data): added support for
+ ServerAlias directive. Patch from Juraj Skripsky
+ , thanks! Closes bug #81878.
+
2007-04-19 Wade Berrier
* configure.in: Version bump -> 1.2.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.2.4/configure new/mod_mono-1.2.5/configure
--- old/mod_mono-1.2.4/configure 2007-04-20 06:15:35.000000000 +0200
+++ new/mod_mono-1.2.5/configure 2007-07-25 01:21:20.000000000 +0200
@@ -2241,7 +2241,7 @@
# Define the identity of the package.
PACKAGE=mod_mono
- VERSION=1.2.4
+ VERSION=1.2.5
cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.2.4/configure.in new/mod_mono-1.2.5/configure.in
--- old/mod_mono-1.2.4/configure.in 2007-04-20 06:15:26.000000000 +0200
+++ new/mod_mono-1.2.5/configure.in 2007-07-25 01:21:11.000000000 +0200
@@ -1,5 +1,5 @@
AC_INIT(src/mod_mono.c)
-AM_INIT_AUTOMAKE(mod_mono, 1.2.4)
+AM_INIT_AUTOMAKE(mod_mono, 1.2.5)
AM_CONFIG_HEADER(include/mod_mono_config.h:config.in)
AC_PROG_CC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.2.4/src/mod_mono.c new/mod_mono-1.2.5/src/mod_mono.c
--- old/mod_mono-1.2.4/src/mod_mono.c 2007-04-20 06:15:25.000000000 +0200
+++ new/mod_mono-1.2.5/src/mod_mono.c 2007-07-25 01:21:11.000000000 +0200
@@ -434,19 +434,26 @@
write_data (apr_socket_t *sock, const void *str, apr_size_t size)
{
apr_size_t prevsize = size;
-
- if (apr_socket_send (sock, str, &size) != APR_SUCCESS)
+ apr_status_t statcode;
+
+ if ((statcode = apr_socket_send (sock, str, &size)) != APR_SUCCESS) {
+ ap_log_error (APLOG_MARK, APLOG_ERR, STATCODE_AND_SERVER (statcode), "write_data failed");
return -1;
-
+ }
+
return (prevsize == size) ? size : -1;
}
static int
read_data (apr_socket_t *sock, void *ptr, apr_size_t size)
{
- if (apr_socket_recv (sock, ptr, &size) != APR_SUCCESS)
+ apr_status_t statcode;
+
+ if ((statcode = apr_socket_recv (sock, ptr, &size)) != APR_SUCCESS) {
+ ap_log_error (APLOG_MARK, APLOG_ERR, STATCODE_AND_SERVER (statcode), "read_data failed");
return -1;
-
+ }
+
return size;
}
@@ -552,9 +559,11 @@
char *name;
char *value;
- if (read_data_string (r->pool, sock, &str, &size) == NULL)
+ if (read_data_string (r->pool, sock, &str, &size) == NULL) {
+ ap_log_error (APLOG_MARK, APLOG_ERR, STATUS_AND_SERVER, "failed to read data string");
return -1;
-
+ }
+
DEBUG_PRINT (2, "Headers length: %d", size);
pos = 0;
while (size > 0) {
@@ -626,6 +635,7 @@
uint32_t actual_size;
int status = 0;
apr_pool_t *temp_pool;
+ char *error_message = NULL;
if (command < 0 || command >= LAST_COMMAND) {
ap_log_error (APLOG_MARK, APLOG_ERR, STATUS_AND_SERVER,
@@ -640,6 +650,7 @@
case SEND_FROM_MEMORY:
apr_pool_create (&temp_pool, r->pool);
if (read_data_string (temp_pool, sock, &str, &size) == NULL) {
+ error_message = "failed to read data for SEND_FROM_MEMORY command";
status = -1;
apr_pool_destroy (temp_pool);
break;
@@ -654,15 +665,23 @@
cstr = apr_table_get (r->subprocess_env, "HTTPS");
if (cstr != NULL && !strcmp (cstr, "on"))
apr_table_add (r->subprocess_env, "SERVER_PORT_SECURE", "True");
- status = !send_table (r->pool, r->subprocess_env, sock);
+ if (!send_table (r->pool, r->subprocess_env, sock)) {
+ error_message = "failed to send server variables";
+ status = -1;
+ } else
+ status = 0;
break;
case SET_RESPONSE_HEADERS:
status = send_response_headers (r, sock);
+ if (status < 0)
+ error_message = "failed to send response headers";
break;
case GET_LOCAL_PORT:
i = connection_get_local_port (r);
i = LE_FROM_INT (i);
status = write_data (sock, &i, sizeof (int32_t));
+ if (status < 0)
+ error_message = "failed to get local port";
break;
case CLOSE:
return FALSE;
@@ -671,16 +690,22 @@
size = ap_should_client_block (r);
size = LE_FROM_INT (size);
status = write_data (sock, &size, sizeof (int32_t));
+ if (status < 0)
+ error_message = "failed to send the 'should block' flag";
break;
case SETUP_CLIENT_BLOCK:
if (setup_client_block (r) != APR_SUCCESS) {
size = LE_FROM_INT (-1);
status = write_data (sock, &size, sizeof (int32_t));
+ if (status < 0)
+ error_message = "failed to setup client block (data size)";
break;
}
size = LE_FROM_INT (0);
status = write_data (sock, &size, sizeof (int32_t));
+ if (status < 0)
+ error_message = "failed to setup client block (data)";
break;
case GET_CLIENT_BLOCK:
status = read_data (sock, &i, sizeof (int32_t));
@@ -696,17 +721,24 @@
i = ap_get_client_block (r, str, actual_size);
i = LE_FROM_INT (i);
status = write_data (sock, &i, sizeof (int32_t));
+ if (status < 0)
+ error_message = "failed to get client block (data size)";
i = INT_FROM_LE (i);
if (i == -1)
break;
status = write_data (sock, str, i);
+ if (status < 0)
+ error_message = "failed to get client block (data)";
break;
case SET_STATUS:
status = read_data (sock, &i, sizeof (int32_t));
- if (status == -1)
+ if (status == -1) {
+ error_message = "failed to set status (data size)";
break;
-
+ }
+
if (read_data_string (r->pool, sock, &str, NULL) == NULL) {
+ error_message = "failed to set status (data)";
status = -1;
break;
}
@@ -719,6 +751,8 @@
case IS_CONNECTED:
*result = (r->connection->aborted ? 0 : 1);
status = write_data (sock, result, sizeof (int32_t));
+ if (status < 0)
+ error_message = "failed to check if the backend is connected";
break;
case MYNOT_FOUND:
ap_log_error (APLOG_MARK, APLOG_ERR, STATUS_AND_SERVER,
@@ -732,19 +766,24 @@
return FALSE;
case SEND_FILE:
if (read_data_string (r->pool, sock, &str, NULL) == NULL) {
+ error_message = "failed to send file (file name)";
status = -1;
break;
}
status = send_entire_file (r, str, result);
if (status == -1)
- return FALSE;
+ error_message = "failed to send file (file data)";
break;
default:
- *result = HTTP_INTERNAL_SERVER_ERROR;
- return FALSE;
+ error_message = "unknown command";
+ status = -1;
+ break;
}
if (status == -1) {
+ ap_log_error (APLOG_MARK, APLOG_ERR, STATUS_AND_SERVER,
+ "command failed: %s",
+ error_message ? error_message : "unknown error");
*result = HTTP_INTERNAL_SERVER_ERROR;
return FALSE;
}
@@ -1356,10 +1395,15 @@
int i;
char *str, *ptr;
int size;
+ server_rec *s = r->server;
DEBUG_PRINT (2, "Send init1");
size = 1;
size += ((r->method != NULL) ? strlen (r->method) : 0) + sizeof (int32_t);
+ if (s != NULL)
+ size += ((s->is_virtual && s->server_hostname != NULL) ? strlen (s->server_hostname) : 0) + sizeof (int32_t);
+ else
+ size += sizeof (int32_t);
size += ((r->uri != NULL) ? strlen (r->uri) : 0) + sizeof (int32_t);
size += ((r->args != NULL) ? strlen (r->args) : 0) + sizeof (int32_t);
size += ((r->protocol != NULL) ? strlen (r->protocol) : 0) + sizeof (int32_t);
@@ -1379,8 +1423,12 @@
}
ptr = str = apr_pcalloc (r->pool, size);
- *ptr++ = 6; /* version. Keep in sync with ModMonoRequest. */
+ *ptr++ = 7; /* version. Keep in sync with ModMonoRequest. */
ptr += write_string_to_buffer (ptr, 0, r->method);
+ if (s != NULL)
+ ptr += write_string_to_buffer (ptr, 0, (s->is_virtual ? s->server_hostname : NULL));
+ else
+ ptr += write_string_to_buffer (ptr, 0, NULL);
ptr += write_string_to_buffer (ptr, 0, r->uri);
ptr += write_string_to_buffer (ptr, 0, r->args);
ptr += write_string_to_buffer (ptr, 0, r->protocol);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.2.4/src/mod_mono.h new/mod_mono-1.2.5/src/mod_mono.h
--- old/mod_mono-1.2.4/src/mod_mono.h 2007-04-20 06:15:25.000000000 +0200
+++ new/mod_mono-1.2.5/src/mod_mono.h 2007-07-25 01:21:11.000000000 +0200
@@ -59,7 +59,7 @@
#ifdef HAVE_HTTP_PROTOCOL_H
#include "http_protocol.h"
#endif
-#define STATUS_AND_SERVER NULL
+#define STATCODE_AND_SERVER (code) NULL
#ifndef TRUE
#define TRUE 1
#define FALSE 0
@@ -132,7 +132,7 @@
/* End Apache 1.3 only */
#else
/* Apache 2 only */
-#define STATUS_AND_SERVER 0, NULL
+#define STATCODE_AND_SERVER(__code__) __code__, NULL
#include
#include
#include
@@ -149,6 +149,8 @@
/* End Apache 2 only */
#endif
+#define STATUS_AND_SERVER STATCODE_AND_SERVER (0)
+
/* Some defaults */
#ifndef MONO_PREFIX
#define MONO_PREFIX "/usr"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org