You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2013/05/21 22:37:02 UTC
svn commit: r1484944 - in /tcl/rivet/trunk: ChangeLog Makefile.in
src/apache-2/apache_request.c src/apache-2/mod_rivet.c
Author: mxmanghi
Date: Tue May 21 20:37:01 2013
New Revision: 1484944
URL: http://svn.apache.org/r1484944
Log:
* src/apache-2/apache_request.c: ApacheRequest___parse further simplified and
made less restrictive about the combination of method and mimetype of the request
* src/apache-2/mod_rivet.c: add debug message in exit handler
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/src/apache-2/apache_request.c
tcl/rivet/trunk/src/apache-2/mod_rivet.c
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1484944&r1=1484943&r2=1484944&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue May 21 20:37:01 2013
@@ -1,3 +1,8 @@
+2013-05-21 Massimo Manghi <mx...@apache.org>
+ * src/apache-2/apache_request.c: ApacheRequest___parse further simplified and
+ made less restrictive about the combination of method and mimetype of the request
+ * src/apache-2/mod_rivet.c: add debug message in exit handler
+
2013-05-06 Massimo Manghi <mx...@apache.org>
* src/apache-2/rivetCore.c: call to 'panic' changed to fulfill the hardening
flags that (quite oddly) fail when building against Tcl8.6 on some platforms
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1484944&r1=1484943&r2=1484944&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Tue May 21 20:37:01 2013
@@ -69,8 +69,6 @@ DIST_COMMON = README $(am__configure_dep
tclconfig/ltmain.sh tclconfig/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/tclconfig/tcl.m4 \
$(top_srcdir)/tclconfig/libtool.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
Modified: tcl/rivet/trunk/src/apache-2/apache_request.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/apache_request.c?rev=1484944&r1=1484943&r2=1484944&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/apache_request.c (original)
+++ tcl/rivet/trunk/src/apache-2/apache_request.c Tue May 21 20:37:01 2013
@@ -371,6 +371,7 @@ static void split_to_parms(ApacheRequest
int ApacheRequest___parse(ApacheRequest *req)
{
request_rec *r = req->r;
+ const char *ct = apr_table_get(r->headers_in, "Content-type");
int result;
if (r->args) {
@@ -378,25 +379,10 @@ int ApacheRequest___parse(ApacheRequest
req->nargs = ((apr_array_header_t *)req->parms)->nelts;
}
- if (r->method_number == M_POST || r->method_number == M_PUT || r->method_number == M_DELETE) {
- const char *ct = apr_table_get(r->headers_in, "Content-type");
- if (ct)
- {
- ap_log_rerror(REQ_INFO, "content-type: `%s'", ct);
- if (strncaseEQ(ct, MULTIPART_ENCTYPE, MULTIPART_ENCTYPE_LENGTH))
- {
- result = ApacheRequest_parse_multipart(req,ct);
- }
- else
- {
- result = ApacheRequest_parse_urlencoded(req);
- }
-
- } else {
- ap_log_rerror(REQ_ERROR, "unknown content-type");
- result = HTTP_INTERNAL_SERVER_ERROR;
- }
-
+ if ((r->method_number == M_POST) && ct && strncaseEQ(ct, MULTIPART_ENCTYPE, MULTIPART_ENCTYPE_LENGTH))
+ {
+ ap_log_rerror(REQ_INFO, "content-type: `%s'", ct);
+ result = ApacheRequest_parse_multipart(req,ct);
}
else
{
@@ -413,18 +399,22 @@ int ApacheRequest_parse_urlencoded(Apach
int rc = OK;
if (r->method_number == M_POST || r->method_number == M_PUT || r->method_number == M_DELETE) {
- const char *data = NULL, *type;
-
+ const char *data = NULL;
+
+ /*
+ const char *type;
type = apr_table_get(r->headers_in, "Content-Type");
if (!strncaseEQ(type, DEFAULT_ENCTYPE, DEFAULT_ENCTYPE_LENGTH) &&
!strncaseEQ(type, TEXT_XML_ENCTYPE, TEXT_XML_ENCTYPE_LENGTH)) {
return DECLINED;
}
+ */
if ((rc = util_read(req, &data)) != OK) {
return rc;
}
+
if (data) {
req->raw_post = (char*) data; /* Give people a way of getting at the raw data. */
split_to_parms(req, data);
Modified: tcl/rivet/trunk/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/mod_rivet.c?rev=1484944&r1=1484943&r2=1484944&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/trunk/src/apache-2/mod_rivet.c Tue May 21 20:37:01 2013
@@ -1551,6 +1551,8 @@ static apr_status_t
Rivet_ChildExit(void *data)
{
server_rec *s = (server_rec*) data;
+
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, s, MODNAME ": Running ChildExit handler");
Rivet_ChildHandlers(s, 0);
/* Tcl_Finalize remove to meet requirement to coexist with mod_websh (Bug #54162) */
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org