svn commit: r1686638 - /tomcat/native/trunk/native/src/ssl.c
Author: jfclere
Date: Sat Jun 20 15:21:39 2015
New Revision: 1686638
URL: http://svn.apache.org/r1686638
Log:
Fix warnings.
Modified:
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1686638&r1=1686637&r2=1686638&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Sat Jun 20 15:21:39 2015
@@ -1377,7 +1377,7 @@ TCN_IMPLEMENT_CALL(jstring, SSL, getNext
UNREFERENCED(o);
SSL_get0_next_proto_negotiated(ssl_, &proto, &proto_len);
-return tcn_new_stringn(e, proto, proto_len);
+return tcn_new_stringn(e, (const char *)proto, (size_t) proto_len);
}
/*** End Twitter API Additions ***/
@@ -1399,7 +1399,7 @@ TCN_IMPLEMENT_CALL(jstring, SSL, getAlpn
UNREFERENCED(o);
SSL_get0_alpn_selected(ssl_, &proto, &proto_len);
-return tcn_new_stringn(e, proto, proto_len);
+return tcn_new_stringn(e, (const char *) proto, (size_t) proto_len);
}
TCN_IMPLEMENT_CALL(jobjectArray, SSL, getPeerCertChain)(TCN_STDARGS,
@@ -1678,8 +1678,8 @@ TCN_IMPLEMENT_CALL(jboolean, SSL, setCip
TCN_IMPLEMENT_CALL(jbyteArray, SSL, getSessionId)(TCN_STDARGS, jlong ssl)
{
-int len;
-const char *session_id;
+unsigned int len;
+const unsigned char *session_id;
const SSL_SESSION *session;
jbyteArray bArray;
SSL *ssl_ = J2P(ssl, SSL *);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58063] New: Some async responses are empty when using Javamelody and Spring-webmvc
https://bz.apache.org/bugzilla/show_bug.cgi?id=58063 Bug ID: 58063 Summary: Some async responses are empty when using Javamelody and Spring-webmvc Product: Tomcat 7 Version: 7.0.47 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ever...@free.fr Created attachment 32840 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32840&action=edit Source to reproduce the issue I have a test webapp using async with Javamelody 1.56 and Spring-webmvc, in Tomcat 7.0.47 with JDK 1.7.0_80. When running in Tomcat 7.0.47, some async cases do not work and http responses are empty (buttons Async, Callable, Forward Async and Forward Callable), while others are OK (buttons Ajax, Redirect Ajax, Redirect Async, Redirect Callable, Forward Ajax, ResponseBody Async, ResponseBody Callable). When running in Jetty 9.1.0_RC2, all cases are OK. I created this issue as suggested by Mark [1]. To reproduce the issue: - unzip attached test-V3.zip - mvn tomcat7:run - open http://localhost:8080/ -> 4 buttons do not work and have empty responses, with javamelody - mvn jetty:run - open http://localhost:8080/ -> all buttons work, with javamelody - comment javamelody in pom.xml - mvn tomcat7:run - open http://localhost:8080/ -> all buttons work, without javamelody Note: the last change [2], added before flushing the response, does not fix the issue. If the httpResponse is not wrapped in a CounterServletResponseWrapper by the MonitoringFilter [3] or if Jetty is used instead of Tomcat, there is no more issue but I do not know why. This issue is also 338 in Javamelody: https://code.google.com/p/javamelody/issues/detail?id=338#c6 [1] http://mail-archives.apache.org/mod_mbox/tomcat-users/201506.mbox/%3c557da84b.9010...@apache.org%3E [2] https://code.google.com/p/javamelody/source/detail?r=4090 [3] https://code.google.com/p/javamelody/source/browse/trunk/javamelody-core/src/main/java/net/bull/javamelody/MonitoringFilter.java#181 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58063] Some async responses are empty when using Javamelody and Spring-webmvc
https://bz.apache.org/bugzilla/show_bug.cgi?id=58063 evernat changed: What|Removed |Added OS||All CC||ever...@free.fr -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "Development" by theimpaler
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Development" page has been changed by theimpaler: https://wiki.apache.org/tomcat/Development?action=diff&rev1=9&rev2=10 * '''[[JDTCoreBatchCompiler]]''' - Managing Tomcat's dependency on the Eclipse JDT Core Batch Compiler * '''[[RemoveUnpackWARs]]''' - Removing the unpackWARs configuration option * '''[[Development/NestedFilesystem|NestedFilesystem]]''' - Implementing Java NIO !FileSystem API to provide access to JARs nested in a JAR/WAR file (draft proposal and prototype implementation) - * '''[[TomcatGridDiscussion|Tomcat Grid]]''' - Managing Tomcat instances across multiple machines from a centralized Grid Manager. + * '''[[TomcatGrid|Tomcat Grid]]''' - Managing Tomcat instances across multiple machines from a centralized Grid Manager. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatGrid" by theimpaler
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatGrid" page has been changed by theimpaler: https://wiki.apache.org/tomcat/TomcatGrid New page: The Tomcat Grid provides CLI and Web Manager interfaces to manage multiple Tomcat instances from a centralized location. The management includes operations such as start, stop, deploy, and roll back web applications. The following topics discuss some aspects of the grid in more detail: * '''[[TomcatGridDiscussion|General Discussion]]''' * '''[[TomcatGridDesign|Design]]''' * '''[[TomcatGridScreenshots|Screenshots]]''' - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatGridDesign" by theimpaler
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "TomcatGridDesign" page has been changed by theimpaler:
https://wiki.apache.org/tomcat/TomcatGridDesign
New page:
== Directory structure ==
Tentative directory structures are desbribed below for the Manager
installations, and for the Agents.
Maybe we could merge both the Manager and Agent structure so all machines could
run the CLI and Web Managers by definition.
=== Manager ===
The Manager directory structure contains the managers applications, the
configuration, and all the deployables:
{{{
+- bin : Grid executables
| +- grid.sh : CLI Manager script (can also start/stop
the Web Manager)
| +- grid.bat: CLI Manager script (can also start/stop
the Web Manager)
| +- grid-.jar : CLI Manager library
| +- grid-.war : Web Manager application
+- conf : Configurations dir
| +- grid.xml: Grid configuration file
+- deployables : Contains installables and releases files
+- agent : Agent package (installable)
| +- agent-.tgz : Agent executables
| +- agent.sh: Agent script
| +- agent.bat : Agent script
| +- agent-.jar : Agent library
+- layouts : Layouts (Tomcat installables) dir
| +- tomcat-8.0.13.tgz : A Tomcat layout (installable)
| +- tomcat-8.0.13-core.tgz: A Tomcat layout (installable)
| +- tomcat-8.0.21-core.tgz: A Tomcat layout (installable)
+- libraries : Uploaded libraries (ready to install)
| +- ojdbc6.jar: A library
| +- apache-activemq-4.1.0.jar : A library
+- hooks : Stores all hooks scripts
+- releases: Stores the releases
+- : A release version (autogenerated or
specified)
| +- : A war application alias
| | +- .war : War application (file or dir)
| +- : A war application alias
| +- .war : War application (file or dir)
+- : A release version (autogenerated or
specified)
+- : A war application alias
| +- .war : War application (file or dir)
+- : A war application alias
+- .war : War application (file or dir)
}}}
=== Agent ===
The Agent directory structure contains the agent application, the grid and
agent configurations, all deployables, and all the local Tomcat instances:
{{{
+- bin : Agent executables
| +- agent.sh: Agent script
| +- agent.bat : Agent script
| +- agent-.jar : Agent library
+- conf : Configurations dir
| +- grid.xml: Grid configuration file
| +- agent.xml : Agent data file (includes agent id,
agent_home, etc.)
+- deployables...: Replicated copy of the "deployables" dir
of the Manager
+- instances : Contains all the local Tomcat instances
+- : Tomcat installation for the instance
+- : Tomcat installation for the instance
+- : Tomcat installation for the instance
}}}
== Configuration files ==
Two configuration files are envisioned. All extra configuration, such as
libraries, installables, web applications, hooks, etc are referenced on the
configuration file but are stored in the standard file system locations as
described above.
=== Grid configuration file ===
The following example grid.xml configuration file, the main configuration file
considers a Tomcat Grid with four instances in two machines:
* '''terminus''' (machine):
* '''tomcat101''' (tomcat instance): runs the '''customer facing''' war.
* '''tomcat102''' (tomcat instance): runs the '''customer care''' war
(lighter config).
* '''anacreon''' (machine):
* '''tomcat201''' (tomcat instance): runs the '''customer facing''' war.
* '''tomcat202''' (tomcat instance): runs the '''customer care''' war
(lighter config), and the '''backend''' war.
As an overview, the configuration file shown below includes all machines and
all Tomcat instances for each one. Particularly each Tomcat instance specifies:
* Its name.
* The Tomcat layout (core Tomcat installable) to use.
* All additions to the layout (libraries, drivers, etc.)
* The full JVM profile (java options) to run the Tomcat instance.
* The full Tomcat server profile (aka server.xml) to use.
* All the web applications to deploy, including their context configurations,
and virtual hosts.
This information covers all the aspects needed to run each instance.
Considering the profiles are usually shared between instances (the customer
[Tomcat Wiki] Update of "TomcatGridScreenshots" by theimpaler
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatGridScreenshots" page has been changed by theimpaler: https://wiki.apache.org/tomcat/TomcatGridScreenshots New page: == Screenshots == * '''[[TomcatGridScreenshotsAlpha1|alpha1]]''' - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatGridScreenshotsAlpha1" by theimpaler
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "TomcatGridScreenshotsAlpha1" page has been changed by theimpaler:
https://wiki.apache.org/tomcat/TomcatGridScreenshotsAlpha1
New page:
These screenshots help as an overview of the basic capabilities the Web and CLI
Managers can provide:
=== The Web Manager dashboard page shows the status of the grid ===
{{attachment:TomcatGridWebManager.png}}
=== The CLI can also show the status of the grid as ===
{{attachment:TomcatGridCliManager1.png}}
=== A few operations using the CLI Manager ===
{{attachment:TomcatGridCliManager2.png}}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] New attachment added to page TomcatGridScreenshotsAlpha1
Dear Wiki user, You have subscribed to a wiki page "TomcatGridScreenshotsAlpha1" for change notification. An attachment has been added to that page by theimpaler. Following detailed information is available: Attachment name: TomcatGridWebManager.png Attachment size: 57845 Attachment link: https://wiki.apache.org/tomcat/TomcatGridScreenshotsAlpha1?action=AttachFile&do=get&target=TomcatGridWebManager.png Page link: https://wiki.apache.org/tomcat/TomcatGridScreenshotsAlpha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] New attachment added to page TomcatGridScreenshotsAlpha1
Dear Wiki user, You have subscribed to a wiki page "TomcatGridScreenshotsAlpha1" for change notification. An attachment has been added to that page by theimpaler. Following detailed information is available: Attachment name: TomcatGridCliManager1.png Attachment size: 32043 Attachment link: https://wiki.apache.org/tomcat/TomcatGridScreenshotsAlpha1?action=AttachFile&do=get&target=TomcatGridCliManager1.png Page link: https://wiki.apache.org/tomcat/TomcatGridScreenshotsAlpha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] New attachment added to page TomcatGridScreenshotsAlpha1
Dear Wiki user, You have subscribed to a wiki page "TomcatGridScreenshotsAlpha1" for change notification. An attachment has been added to that page by theimpaler. Following detailed information is available: Attachment name: TomcatGridCliManager2.png Attachment size: 42346 Attachment link: https://wiki.apache.org/tomcat/TomcatGridScreenshotsAlpha1?action=AttachFile&do=get&target=TomcatGridCliManager2.png Page link: https://wiki.apache.org/tomcat/TomcatGridScreenshotsAlpha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
