cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http Parameters.java

2003-04-05 Thread remm
remm2003/04/05 00:19:28

  Modified:util/java/org/apache/tomcat/util/http Tag: coyote_10
Parameters.java
  Log:
  - Port patch to Tomcat 4.1.x (fix params restore with FORM auth).
  - Submitted by Jeff Tulley.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.8.2.1   +20 -0 
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Parameters.java
  
  Index: Parameters.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Parameters.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- Parameters.java   29 Jun 2002 02:15:02 -  1.8
  +++ Parameters.java   5 Apr 2003 08:19:28 -   1.8.2.1
  @@ -190,6 +190,26 @@
   
   // This is the original data representation ( hash of String-String[])
   
  +public void addParameterValues( String key, String[] newValues) {
  +if( key==null ) return;
  +String values[];
  +if (paramHashStringArray.containsKey(key)) {
  +String oldValues[] = (String[])paramHashStringArray.
  +get(key);
  +values = new String[oldValues.length + newValues.length];
  +for (int i = 0; i  oldValues.length; i++) {
  +values[i] = oldValues[i];
  +}
  +for (int i = 0; i  newValues.length; i++) {
  +values[i+ oldValues.length] = newValues[i];
  +}
  +} else {
  +values = newValues;
  +}
  +
  +paramHashStringArray.put(key, values);
  +}
  +
   public String[] getParameterValues(String name) {
handleQueryParameters();
// sub-request
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java

2003-04-05 Thread remm
remm2003/04/05 00:19:40

  Modified:coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10
CoyoteRequest.java
  Log:
  - Port patch to Tomcat 4.1.x (fix params restore with FORM auth).
  - Submitted by Jeff Tulley.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.28.2.1  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
  
  Index: CoyoteRequest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
  retrieving revision 1.28
  retrieving revision 1.28.2.1
  diff -u -r1.28 -r1.28.2.1
  --- CoyoteRequest.java24 Nov 2002 11:56:15 -  1.28
  +++ CoyoteRequest.java5 Apr 2003 08:19:39 -   1.28.2.1
  @@ -1262,7 +1262,7 @@
* @param values Corresponding values for this request parameter
*/
   public void addParameter(String name, String values[]) {
  -// Not used
  +coyoteRequest.getParameters().addParameterValues(name, values);
   }
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[GUMP] Build timed out - jk

2003-04-05 Thread Craig McClanahan

This email is autogenerated from the output from:
http://cvs.apache.org/builds/gump/2003-04-05/jakarta-tomcat-jk-native.html


Buildfile: build.xml

init:
 [echo] /home/rubys
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk
 [echo] linux=true solaris=${solaris} win32=${win32} hpux=${hpux} 
netware=${netware}

apache20:

apache13:

iis:

netscape:

jni:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk/jni
   [so] Compiling 4 out of 4
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_map.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_util.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/jni/jk_jnicb.c
Linking /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk/jni/jni_connect.so
/home/rubys/bin/timeout: timed out

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[GUMP] Build Failure - jakarta-tomcat-5

2003-04-05 Thread bobh

This email is autogenerated from the output from:
http://cvs.apache.org/builds/gump/2003-04-05/jakarta-tomcat-5.html


Build results exceed maximum length.
Please see URL above for details.
Last 50 lines of build output follows.

  [jasper2] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
  [jasper2] at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
  [jasper2] at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
  [jasper2] at java.lang.reflect.Method.invoke(Method.java:324)
  [jasper2] at org.apache.tools.ant.TaskAdapter.execute(TaskAdapter.java:147)
  [jasper2] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:230)
  [jasper2] at org.apache.tools.ant.Task.perform(Task.java:388)
  [jasper2] at org.apache.tools.ant.Target.execute(Target.java:309)
  [jasper2] at org.apache.tools.ant.Target.performTasks(Target.java:336)
  [jasper2] at org.apache.tools.ant.Project.executeTarget(Project.java:1405)
  [jasper2] at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:414)
  [jasper2] at 
org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:144)
  [jasper2] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:230)
  [jasper2] at org.apache.tools.ant.Task.perform(Task.java:388)
  [jasper2] at org.apache.tools.ant.Target.execute(Target.java:309)
  [jasper2] at org.apache.tools.ant.Target.performTasks(Target.java:336)
  [jasper2] at org.apache.tools.ant.Project.executeTarget(Project.java:1405)
  [jasper2] at org.apache.tools.ant.Project.executeTargets(Project.java:1279)
  [jasper2] at org.apache.tools.ant.Main.runBuild(Main.java:611)
  [jasper2] at org.apache.tools.ant.Main.start(Main.java:198)
  [jasper2] at org.apache.tools.ant.Main.main(Main.java:245)
  [jasper2] org.apache.jasper.JasperException: Error compiling /saved.jsp
  [jasper2] at org.apache.jasper.JspC.processFile(Unknown Source)
  [jasper2] at org.apache.jasper.JspC.execute(Unknown Source)
  [jasper2] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
  [jasper2] at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
  [jasper2] at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
  [jasper2] at java.lang.reflect.Method.invoke(Method.java:324)
  [jasper2] at org.apache.tools.ant.TaskAdapter.execute(TaskAdapter.java:147)
  [jasper2] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:230)
  [jasper2] at org.apache.tools.ant.Task.perform(Task.java:388)
  [jasper2] at org.apache.tools.ant.Target.execute(Target.java:309)
  [jasper2] at org.apache.tools.ant.Target.performTasks(Target.java:336)
  [jasper2] at org.apache.tools.ant.Project.executeTarget(Project.java:1405)
  [jasper2] at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:414)
  [jasper2] at 
org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:144)
  [jasper2] at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:230)
  [jasper2] at org.apache.tools.ant.Task.perform(Task.java:388)
  [jasper2] at org.apache.tools.ant.Target.execute(Target.java:309)
  [jasper2] at org.apache.tools.ant.Target.performTasks(Target.java:336)
  [jasper2] at org.apache.tools.ant.Project.executeTarget(Project.java:1405)
  [jasper2] at org.apache.tools.ant.Project.executeTargets(Project.java:1279)
  [jasper2] at org.apache.tools.ant.Main.runBuild(Main.java:611)
  [jasper2] at org.apache.tools.ant.Main.start(Main.java:198)
  [jasper2] at org.apache.tools.ant.Main.main(Main.java:245)
[javac] Compiling 1 source file to 
/home/rubys/jakarta/jakarta-tomcat-5/build/webapps/ROOT/WEB-INF/classes

BUILD FAILED
/home/rubys/jakarta/jakarta-tomcat-5/build.xml:344: 
/home/rubys/jakarta/jakarta-tomcat-5/build/webapps/jsp-examples/WEB-INF/src/tags not 
found.

Total time: 1 minute 21 seconds

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[GUMP] Build timed out - jk2

2003-04-05 Thread Craig McClanahan

This email is autogenerated from the output from:
http://cvs.apache.org/builds/gump/2003-04-05/jakarta-tomcat-jk-native2.html


Buildfile: build.xml

init.taskdef:

guess.os:
 [echo] build.properties i386.Linux
 [echo] Linux:true Win32:${win32} Netware:${netware} Solaris:${solaris} 
HPUX:${hpux}

init.win32.properties:

init.win32.mc:

init.win32:

init.netware:

init.os:

guess.server:
 [echo] Apache2 /usr/local/apache2 true
 [echo] Apache13 /usr true
 [echo] IIS ${iis.home} ${iis.detect}
 [echo] Iplanet ${iplanet.home} ${iplanet.detect}
 [echo] JNI true


init:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk2

apache20:
[mkdir] Created dir: 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk2/apache2
   [so] Compiling 42 out of 42
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_map.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_md5.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_proc.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_mutex.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_nwmain.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
   [so] Warnings: 
   [so] /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c: 
In function `jk2_pool_a_strdup':
   [so] 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c:282: 
warning: empty body in an if-statement
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_signal.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_user.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
   [so] Warnings: 
   [so] 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c:449:77:
 warning: backslash and newline separated by space
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_worker_run.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c
Compiling