Modified: perl/embperl/trunk/epdom.c URL: http://svn.apache.org/viewvc/perl/embperl/trunk/epdom.c?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/epdom.c (original) +++ perl/embperl/trunk/epdom.c Mon Sep 10 05:01:48 2012 @@ -242,8 +242,8 @@ void * str_malloc (/*in*/ tApp * a, else { char buf[256] ; - /* - sprintf (buf, "%u bytes", n) ; + /* + sprintf (buf, "%zu bytes", n) ; LogErrorParam (a, rcOutOfMemory, "str_malloc failed", buf) ; */ sprintf (buf, "str_malloc: Out of memory (%u bytes)", n + sizeof (size_t)) ; @@ -274,7 +274,7 @@ void * str_malloc_dbg (/*in*/ tApp * a, { char buf[256] ; /* - sprintf (buf, "%u bytes", n) ; + sprintf (buf, "%zu bytes", n) ; LogErrorParam (a, rcOutOfMemory, "str_malloc_dbg failed", buf) ; */ sprintf (buf, "str_malloc: Out of memory (%u bytes)", n + sizeof (size_t)) ; @@ -1624,9 +1624,9 @@ int DomTree_clone (/*in*/ tApp * a, /*! * * \_en -* Compare checkpoint from programm execution with list build during +* Compare checkpoint from program execution with list build during * compilation and change the DomTree and repeat level according to the -* programm flow +* program flow * * @param r Embperl request data * @param xDomTree current DomTree we are working on @@ -2246,10 +2246,10 @@ tNodeData * Node_selfLevelItem (/*in*/ t * @param pDomTree current DomTree we are working on * @param pNode node that should be cloned * @param nRepeatLevel repeat level for new node -* @param bDeep determines how childs are handled -* - 1 clone childs also -* - 0 clone no childs -* - -1 clone no attributes and no childs +* @param bDeep determines how children are handled +* - 1 clone children also +* - 0 clone no children +* - -1 clone no attributes and no children * \endif * * \_de @@ -2335,10 +2335,10 @@ tNodeData * Node_selfCloneNode (/*in*/ t * @param pDomTree current DomTree we are working on * @param xNode node that should be cloned * @param nRepeatLevel repeat level for new node -* @param bDeep determines how childs are handled -* - 1 clone childs also -* - 0 clone no childs -* - -1 clone no attributes and no childs +* @param bDeep determines how children are handled +* - 1 clone children also +* - 0 clone no children +* - -1 clone no attributes and no children * \endif * * \_de @@ -2595,7 +2595,7 @@ tNodeData * Node_newAndAppend (/*in*/ tA pNewChild -> nRepeatLevel = nRepeatLevel ; if (xChilds) - { /* --- attribute has already childs, get the first and last one --- */ + { /* --- attribute has already children, get the first and last one --- */ tNodeData * pFirstChild = Node_selfLevel (a, pDomTree, xChilds, nRepeatLevel) ; tNodeData * pLastChild = Node_selfLevel (a, pDomTree, pFirstChild -> xPrev, nRepeatLevel) ; pFirstChild = Node_selfCondCloneNode (a, pDomTree, pFirstChild, nRepeatLevel) ; @@ -2607,7 +2607,7 @@ tNodeData * Node_newAndAppend (/*in*/ tA pLastChild -> xNext = xNdx ; } else - /* --- attribute has no childs, get a new one --- */ + /* --- attribute has no children, get a new one --- */ { pNewChild -> xPrev = xNdx ; pNewChild -> xNext = xNdx ;
Modified: perl/embperl/trunk/epinit.c URL: http://svn.apache.org/viewvc/perl/embperl/trunk/epinit.c?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/epinit.c (original) +++ perl/embperl/trunk/epinit.c Mon Sep 10 05:01:48 2012 @@ -1126,7 +1126,7 @@ static int embperl_GetFormData (/*i/o*/ { /* New Field -> store it */ pSVV = newSVpv (pVal, nVal) ; #ifdef UTF8_IS_START - if (mayutf8 && is_utf8_string(pVal, nVal)) + if (mayutf8 && is_utf8_string((U8*)pVal, nVal)) SvUTF8_on (pSVV) ; #endif if (hv_store (pFormHash, pKey, nKey, pSVV, 0) == NULL) Modified: perl/embperl/trunk/epmain.c URL: http://svn.apache.org/viewvc/perl/embperl/trunk/epmain.c?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/epmain.c (original) +++ perl/embperl/trunk/epmain.c Mon Sep 10 05:01:48 2012 @@ -32,8 +32,8 @@ * @param r the request object (maybe NULL) * @param a the application object (maybe NULL) * @param rc the error code -* @param errdat1 addtional informations -* @param errdat2 addtional informations +* @param errdat1 addtional information +* @param errdat2 addtional information * \endif * * \_de @@ -176,7 +176,7 @@ static char * DoLogError (/*i/o*/ struct case rcRefcntNotOne: msg ="[%d]ERR: %d: %s There is still %s reference(s) to the %s object, while there shouldn't be any." ; break ; case rcApacheErr: msg ="[%d]ERR: %d: %s Apache returns Error: %s %s" ; break ; case rcTooDeepNested: msg ="[%d]ERR: %d: %s Source data is too deep nested %s %s" ; break ; - case rcUnknownOption: msg ="[%d]ERR: %d: %s Unkown option '%s' in configuration directive '%s'" ; break ; + case rcUnknownOption: msg ="[%d]ERR: %d: %s Unknown option '%s' in configuration directive '%s'" ; break ; case rcTimeFormatErr: msg ="[%d]ERR: %d: %s Format error in %s = %s" ; break ; case rcSubCallNotRequest: msg ="[%d]ERR: %d: %s A Embperl sub is called and no Embperl request is running %s %s" ; break ; case rcNotScalarRef: msg ="[%d]ERR: %d: %s %s need scalar in '%s'" ; break ; @@ -301,8 +301,8 @@ static char * DoLogError (/*i/o*/ struct * * @param a the application object * @param rc the error code -* @param errdat1 addtional informations -* @param errdat2 addtional informations +* @param errdat1 addtional information +* @param errdat2 addtional information * \endif * * \_de @@ -334,7 +334,7 @@ char * LogErrorParam (/*i/o*/ struct t * * \_en * Logs the occurence of an error to the embperl logfile and the httpd error log -* Addtional informations, like stack backtrace, is taken from the request object +* Addtional information, like stack backtrace, is taken from the request object * * @param r the request object * @param rc the error code @@ -707,7 +707,7 @@ static int StartOutput (/*i/o*/ register send_http_header (r -> pApacheReq) ; #endif #ifndef WIN32 - /* shouldn't be neccessary for newer mod_perl versions !? */ + /* shouldn't be necessary for newer mod_perl versions !? */ /* mod_perl_sent_header(r -> pApacheReq, 1) ; */ #endif if (r -> pApacheReq -> header_only) @@ -818,10 +818,12 @@ static int GenerateErrorPage (/*i/o*/ re SPAGAIN ; #ifdef APACHE if (r -> pApacheReq) + { if (rc >= 400) r -> pApacheReq -> status = rc ; else r -> pApacheReq -> status = 500 ; + } #endif SetHashValueInt (r, r -> pThread -> pHeaderHash, "Content-Length", GetContentLength (r) ) ; Modified: perl/embperl/trunk/epparse.c URL: http://svn.apache.org/viewvc/perl/embperl/trunk/epparse.c?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/epparse.c (original) +++ perl/embperl/trunk/epparse.c Mon Sep 10 05:01:48 2012 @@ -62,7 +62,7 @@ static int CmpTokenDesc (/*in*/ const vo /* */ /* CheckProcInfo */ /* */ -/* Check for processor informations */ +/* Check for processor information */ /* */ /* ------------------------------------------------------------------------ */ Modified: perl/embperl/trunk/epprovider.c URL: http://svn.apache.org/viewvc/perl/embperl/trunk/epprovider.c?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/epprovider.c (original) +++ perl/embperl/trunk/epprovider.c Mon Sep 10 05:01:48 2012 @@ -1253,7 +1253,7 @@ static int ProviderEpCompile_AppendKey ( * \_en * Get the whole content from the provider. * The Embperl compile provider compiles the source DomTRee and generates -* a Perl programm and a compiled DomTRee +* a Perl program and a compiled DomTRee * * @param r Embperl request record * @param pProvider The provider record @@ -1325,7 +1325,7 @@ static int ProviderEpCompile_GetContentI * \_en * Get the whole content from the provider. * The Embperl compile provider compiles the source DomTRee and generates -* a Perl programm and a compiled DomTRee +* a Perl program and a compiled DomTRee * * @param r Embperl request record * @param pProvider The provider record @@ -1745,7 +1745,7 @@ static int ProviderEpRun_UpdateParam(/*i /*! * \_en * Get the whole content from the provider. -* The Embperl Run provider executes the compiled DomTree & Perl programm +* The Embperl Run provider executes the compiled DomTree & Perl program * * @param r Embperl request record * @param pProvider The provider record Modified: perl/embperl/trunk/mod_embperl.c URL: http://svn.apache.org/viewvc/perl/embperl/trunk/mod_embperl.c?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/mod_embperl.c (original) +++ perl/embperl/trunk/mod_embperl.c Mon Sep 10 05:01:48 2012 @@ -158,7 +158,7 @@ static const command_rec embperl_cmds[] { #include "epcfg.h" - AP_INIT_FLAG("EMBPERL_USEENV", embperl_Apache_Config_useenv, NULL, RSRC_CONF, "If set to 'on' Embperl will also scan the environment variable for configuration informations"), + AP_INIT_FLAG("EMBPERL_USEENV", embperl_Apache_Config_useenv, NULL, RSRC_CONF, "If set to 'on' Embperl will also scan the environment variable for configuration information"), {NULL} }; Modified: perl/embperl/trunk/podsrc/Config.spod URL: http://svn.apache.org/viewvc/perl/embperl/trunk/podsrc/Config.spod?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/podsrc/Config.spod (original) +++ perl/embperl/trunk/podsrc/Config.spod Mon Sep 10 05:01:48 2012 @@ -3,7 +3,7 @@ =head1 NAME -Configuration and calling +Embperl::Config - Embperl configuration and calling =head1 Operating-Modes @@ -25,14 +25,14 @@ using Embperl together with FastCGI. (ht =item Offline -You can use Embperl also on the command line. This is usefull for generating -static content out of dynamic pages and can sometime be helpfull for testing. +You can use Embperl also on the command line. This is useful for generating +static content out of dynamic pages and can sometime be helpful for testing. -=item Call it from other Perl programms +=item Call it from other Perl programs If you have your own application and want to use Embperl's capbilities you can -do so by calling Embperl::Execute. This allows to build your own application -logic and useing Embperl possibilites for rendering content. +do so by calling Embperl::Execute. This allows you to build your own application +logic and use Embperl possibilites for rendering content. =back @@ -108,7 +108,7 @@ For more information see: L<"perldoc Emb Embperl accepts a lot of configuration directives to customize it's behaviour. See the next section for a description. -B<NOTE:> If mod_perl is staticly linked into Apache you can not use B<ClearModuleList> +B<NOTE:> If mod_perl is statically linked into Apache you can not use B<ClearModuleList> in your httpd.conf =head3 Preloading pages @@ -139,7 +139,7 @@ supply the same parameter like L<Execute B<NOTE:> Preloading is not supported under Apache 1.3, when mod_perl is loaded as DSO. To use preloading under Apache 1.3 you need to compile -mod_perl staticly into Apache. +mod_perl statically into Apache. =head2 CGI/FastCGI @@ -314,7 +314,7 @@ configuration section and parameter sect Starting with 2.0b2 Embperl files can debugged via the interactive debugger. The debugger shows the Embperl page source along with the correct linenumbers. -You can do anything you can do inside a normal Perl programm via the debugger, +You can do anything you can do inside a normal Perl program via the debugger, e.g. show variables, modify variables, single step, set breakpoints etc. You can use the Perl interacive command line debugger via @@ -342,11 +342,11 @@ to the Apache configuration, so you can When you run Embperl as CGI it takes the configuration from environment variables. For compatibility reason that can also be turned on under mod_perl, by adding C<Embperl_UseEnv on> in your -F<httpd.conf>. When you call Embperl from another Perl programm, by calling +F<httpd.conf>. When you call Embperl from another Perl program, by calling the C<Execute> function, you can pass your configuration along with other parameters as a hash reference. If you pass C<use_env =< 1> als parameter Embperl will -also scan the environment for configuration informations. Last but not least -you can pass configuration informations as options when you run Embperl via +also scan the environment for configuration information. Last but not least +you can pass configuration information as options when you run Embperl via embpexec.pl from the command line. Some of the configuration options are also setable inside the page via the Empberl objects and you can read the current configuration from these objects. @@ -375,7 +375,7 @@ Tells Embperl to scan the enviromemt for =head2 *CFG $application / / use_redirect_env / 2.0b6 / no / off unless runing as CGI script Tells Embperl to scan the enviromemt for configuration settings which has the -prefix C<REDIRECT_>. This is normaly the case when the request is not the main request, +prefix C<REDIRECT_>. This is normally the case when the request is not the main request, but a subrequest. =head2 *CFG $application / Embperl_AppName / app_name / 2.0b6 / no @@ -601,7 +601,7 @@ Logs things related to XSLT processing =item dbgCheckpoint = 0x40000000 Logs things related to checkpoints which are internaly used during execution. -This information is only usefull if you have a deep knowledge of Embperl +This information is only useful if you have a deep knowledge of Embperl internals. @@ -618,12 +618,12 @@ Debug value pass to Net::SMTP. Specifies which host the mail related functions of Embperl uses as SMTP server. -=head2 *CFG $application / Embperl_MAILHELO / mailhelo / 1.3b4 / yes / choosen by Net::SMTP +=head2 *CFG $application / Embperl_MAILHELO / mailhelo / 1.3b4 / yes / chosen by Net::SMTP Specifies which host/domain all mailrealted function uses in the HELO/EHLO command. -A reasonable default is normaly choosen by I<Net::SMTP>, but -depending on your installation it may neccessary to set it +A reasonable default is normally chosen by I<Net::SMTP>, but +depending on your installation it may necessary to set it manualy. @@ -634,7 +634,7 @@ Specifies the email address that is used =head2 *CFG $application / Embperl_MAIL_ERRORS_TO / mail_errors_to / / yes -If set all errors will be send to the email adress given. +If set all errors will be send to the email address given. =head2 *CFG $application / Embperl_MAIL_ERRORS_LIMIT / mail_errors_limit / 2.0b6 / no @@ -663,7 +663,7 @@ Filename of the application object that The file should contain the Perl code for the application object. There must be no package name given (as the package is set by Embperl::Object) inside the file, but the @ISA should point to Embperl::App. -If set this file is searched throught the same search path as any content file. +If set this file is searched through the same search path as any content file. After a successfull load the init method is called with the Embperl request object as parameter. The init method can change the parameters inside the request object to influence the current request. @@ -690,7 +690,7 @@ B<always> appended to the searchpath. Additional directories where Embperl::Object searches for files for the inital request. If a file is requested, but cannot be found at the given location, the directories -given in the this path are additionaly searched for the file. This applies only to +given in the this path are additionally searched for the file. This applies only to the initial filename given to Embperl::Object and B<not> to files called via Execute. @@ -747,7 +747,7 @@ Tells Embperl to scan the enviromemt for =head2 *CFG $request / / use_redirect_env / 2.0b6 / no / off unless runing as CGI script Tells Embperl to scan the enviromemt for configuration settings which has the -prefix C<REDIRECT_>. This is normaly the case when the request is not the main request, +prefix C<REDIRECT_>. This is normally the case when the request is not the main request, but a subrequest. =head2 *CFG $request / Embperl_ALLOW / allow / 1.2b10 / no / no restrictions @@ -771,7 +771,7 @@ documents (e.g. gifs) residing in the sa =head2 *CFG $request / Embperl_MULTFIELDSEP / mult_field_sep / 2.0b6 / no / \t -Specifies the charachter that is used to separate multiple form values with the +Specifies the character that is used to separate multiple form values with the same name. =head2 *CFG $request / Embperl_PATH / path / 1.3b6 / no @@ -923,7 +923,7 @@ Tells Embperl to scan the enviromemt for =head2 *CFG $component / / use_redirect_env / 2.0b6 / no / off unless runing as CGI script Tells Embperl to scan the enviromemt for configuration settings which has the -prefix C<REDIRECT_>. This is normaly the case when the request is not the main request, +prefix C<REDIRECT_>. This is normally the case when the request is not the main request, but a subrequest. =head2 *CFG $component / Embperl_PACKAGE / package / / no @@ -1082,10 +1082,10 @@ No escaping takes place. =item escEscape = 4 If you add this value to the above Embperl will always perform the -escaping. Without it is possible to disable escaping by preceeding the item that -normaly is escaped with a backslash. While this is a handy thing, it could +escaping. Without it is possible to disable escaping by preceding the item that +normally is escaped with a backslash. While this is a handy thing, it could be very dangerous in situations, where content that is inserted by some -user is redisplayed, because they can enter arbitary HTML and preceed them +user is redisplayed, because they can enter arbitrary HTML and preceed them with a backslash to avoid correct escaping when their input is redisplayed again. @@ -1124,7 +1124,7 @@ unescape html and url escapes, depending =back -Add 4 to remove html tags inside of Perl code. This is helpfull when +Add 4 to remove html tags inside of Perl code. This is helpful when an html editor insert html tags like <br> inside your Perl code. Set EMBPERL_INPUT_ESCMODE to 7 to get the old default of Embperl < 2.0b6 @@ -1280,7 +1280,7 @@ You can also specify multiple syntaxes e Execute ({inputfile => '*', syntax => 'Embperl ASP'}) ; -The 'syntax' metacommand allows to switch the syntax or to +The 'syntax' metacommand allows you to switch the syntax or to add or subtract syntaxes e.g. [$ syntax + Mail $] @@ -1321,8 +1321,8 @@ are supported by Embperl, but they must Parameters gives addtionaly information about the current request or the execution of the current component. So we have two sorts of parameters I<Request> and I<Component> parameters. Request -parameters are automaticly setup by Embperl with information -Embperl takes from the current running enviroment. When +parameters are automatically setup by Embperl with information +Embperl takes from the current running environment. When Embperl is invoked via the C<Execute> function, you can pass any of the parameters to Execute. Component parameters mainly reflect the parameters given to C<Execute>. @@ -1505,9 +1505,9 @@ Pass a array reference to customly set @ =head2 *PARAM $component / / object / 1.3.2 / no Takes a filename and returns an hashref that is blessed into the package of -the given file. That's usefull, if you want to call the subs inside the +the given file. That's useful, if you want to call the subs inside the given file, as methods. By using the C<isa> parameter (see below) you -are able to provide an inherence tree. Additionaly you can use the returned +are able to provide an inherence tree. Additionally you can use the returned hashref to store data for that object. Example: [# the file eposubs.htm defines two subs: txt1 and txt2 #] @@ -1524,7 +1524,7 @@ hashref to store data for that object. E Takes a name of a file and pushes the package of that file into the @ISA array of the current file. By using this you can setup an inherence tree -between Embperl documents. Is is also usefull within I<Embperl::Object>. +between Embperl documents. Is is also useful within I<Embperl::Object>. Example: [! Execute ({'isa' => '../eposubs.htm'}) !] @@ -1536,7 +1536,7 @@ all errormessages, if any. =head2 *PARAM $component / / xsltparam / 2.0b6 / yes, before the xslt transformation / %fdat -Takes a reference to hash which contains key/value pair that are accessable inside +Takes a reference to hash which contains key/value pair that are accessible inside the stylesheet via <xsl:param>. @@ -1546,7 +1546,7 @@ the stylesheet via <xsl:param>. There are three major objects in Embperl: I<application>, I<request> and I<component>. Each of these objects can be used to get information about the processing and control the execution. Each of these objects has a config sub-object, which makes -the configuration accessable and, where possible, changeable at runtime. The C<config> +the configuration accessible and, where possible, changeable at runtime. The C<config> method of these three objects returns a reference to the configuation object. The methods of these configurations objects are described in the section L<Configuration>. The request and the component object have addtionaly a parameter sub-object, which holds @@ -1558,7 +1558,7 @@ here. =head2 *METHOD $application / / thread / 2.0b6 / no -Returns a reference to a object which hold per threads informations. There is only one +Returns a reference to a object which hold per threads information. There is only one such object per thread. =head2 *METHOD $application / / curr_req / 2.0b6 / no @@ -1638,7 +1638,7 @@ See application methods above. =head2 *METHOD $request / / thread / 2.0b6 / no -Returns a reference to a object which hold per threads informations. There is only one +Returns a reference to a object which hold per threads information. There is only one such object per thread. =head2 *METHOD $request / / request_count / 2.0b6 / no @@ -1689,11 +1689,11 @@ Reference to an array which holds all er =head2 *METHOD $request / / errdat1 / 2.0b6 / yes -Additional informations passed to the error handler when an error is reported. +Additional information passed to the error handler when an error is reported. =head2 *METHOD $request / / errdat2 / 2.0b6 / yes -Additional informations passed to the error handler when an error is reported. +Additional information passed to the error handler when an error is reported. =head2 *METHOD $request / / lastwarn / 2.0b6 / yes @@ -1702,7 +1702,7 @@ Last warning message. =head2 *METHOD $request / / errobj / 2.0rc3 / yes The object passed to the last die, if any. -This is usefully when you pass an object to die inside an Execute. After the Execute you +This is useful when you pass an object to die inside an Execute. After the Execute you can check $epreq -> errobj, to get the object. The object is also push to the array passed to the L<errors> parameter of Execute. @@ -1794,7 +1794,7 @@ True if the exit was called during the e =head2 *METHOD $component / / path_ndx / 2.0b6 / no Tells Embperl how much parts of the L<path> should be ignored when searching -throught the path. +through the path. =head2 *METHOD $component / / cwd / 2.0b6 / no Modified: perl/embperl/trunk/test.pl URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/test.pl (original) +++ perl/embperl/trunk/test.pl Mon Sep 10 05:01:48 2012 @@ -2820,7 +2820,7 @@ do #print FH "BT\n" if ($opt_gdb) ; #close FH ; #system (($opt_ddd?'ddd':'gdb') . " -x dbinitembperlapache $EPHTTPD " . ($opt_startinter?'':'&')) and die "***Cannot start $EPHTTPD" ; - print (($opt_ddd?'ddd':'gdb') . " --args $EPHTTPD " . ($opt_cfgdebug?"-D EMBPERL_APDEBUG ":'') . " $XX -f $EPPATH/$httpdconf ") . "\n" ; + print ' ' . ($opt_ddd?'ddd':'gdb') . " --args $EPHTTPD " . ($opt_cfgdebug?"-D EMBPERL_APDEBUG ":'') . " $XX -f $EPPATH/$httpdconf " . "\n" ; system (($opt_ddd?'ddd':'gdb') . " --args $EPHTTPD " . ($opt_cfgdebug?"-D EMBPERL_APDEBUG ":'') . " $XX -f $EPPATH/$httpdconf ") and die "***Cannot start gdb/ddd $EPHTTPD" ; } else Modified: perl/embperl/trunk/test/cmp/epform.htm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/cmp/epform.htm?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/test/cmp/epform.htm (original) +++ perl/embperl/trunk/test/cmp/epform.htm Mon Sep 10 05:01:48 2012 @@ -11,9 +11,10 @@ Bitte (sinnvollen) Kommentar eingeben <script> -function epform_validate_foo() +function epform_validate_foo(return_msgs, failed_class) { var msgs = new Array ; + var ids = new Array ; var fail = 0 ; var i = 0 ; var obj ; @@ -23,20 +24,20 @@ function epform_validate_foo() do { do { -obj = document.foo['datum'] ; if (!(obj.value)) { msgs[i++]='Bitte Datum eintragen'; break;} -obj = document.foo['datum'] ; if (!(obj.value.search(/\d+\.\d+\.\d+/) >= 0)) { msgs[i++]='Datum überprüfen'; break;} +obj = document.foo['datum'] ; if (obj && !(obj.value)) { ids[i] = 'datum' ; msgs[i++]='Bitte Datum eintragen'; break;} +obj = document.foo['datum'] ; if (obj && !(obj.value.search(/\d+\.\d+\.\d+/) >= 0)) { ids[i] = 'datum' ; msgs[i++]='Datum überprüfen'; break;} } while (0) ; if (fail) break ; do { -obj = document.foo['stunden'] ; if (!(obj.value)) { msgs[i++]='Bitte Stunden eintragen'; break;} -obj = document.foo['stunden'] ; if (!(obj.value.search(/^\s*[0-9+-.][0-9.eE]*\s*$/) >= 0)) { msgs[i++]='Stundenzahl nicht numerisch'; break;} -obj = document.foo['stunden'] ; if (!(obj.value > 0)) { msgs[i++]='Stundenzahl muß >0 sein'; break;} +obj = document.foo['stunden'] ; if (obj && !(obj.value)) { ids[i] = 'stunden' ; msgs[i++]='Bitte Stunden eintragen'; break;} +obj = document.foo['stunden'] ; if (obj && !(obj.value.search(/^\s*[0-9+-.,][0-9.,eE]*\s*$/) >= 0)) { ids[i] = 'stunden' ; msgs[i++]='Stundenzahl nicht numerisch'; break;} +obj = document.foo['stunden'] ; if (obj && !(obj.value > 0)) { ids[i] = 'stunden' ; msgs[i++]='Stundenzahl muß >0 sein'; break;} } while (0) ; if (fail) break ; do { -obj = document.foo['kommentar'] ; if (!(obj.value)) { msgs[i++]='Bitte (sinnvollen) Kommentar eingeben'; break;} +obj = document.foo['kommentar'] ; if (obj && !(obj.value)) { ids[i] = 'kommentar' ; msgs[i++]='Bitte (sinnvollen) Kommentar eingeben'; break;} } while (0) ; if (fail) break ; @@ -44,6 +45,31 @@ obj = document.foo['kommentar'] ; if (!( ; } while (0) ; + if (failed_class) + { + var key ; + var i ; + for (key in ids) + { + var elems = document.foo[ids[key]] ; + if (elems) + { + if (elems.constructor.name != 'NodeList') + elems = [elems] ; + for (i = 0; i < elems.length ;i++) + { + var elem = elems[i] ; + var eclass = elem.getAttribute('class') ; + elem.setAttribute ('class', eclass + ' ' + failed_class) ; + elem.setAttribute ('title', msgs[key]) ; + } + } + } + } + + if (return_msgs) + return msgs ; + if (i) alert (msgs.join('\n')) ; Modified: perl/embperl/trunk/test/conf/httpd.conf.src URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/httpd.conf.src?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/test/conf/httpd.conf.src (original) +++ perl/embperl/trunk/test/conf/httpd.conf.src Mon Sep 10 05:01:48 2012 @@ -5,7 +5,7 @@ print OFH <<EOD ; # # Testconfig for Embperl make test # -# This file is automaticly generated each time you run make test/make start/make stop +# This file is automatically generated each time you run make test/make start/make stop # ServerRoot \"$EPPATH/test\" @@ -44,7 +44,7 @@ SetEnv EMBPERL_SRC \"$EPPATH\" PerlSetEnv DMALLOC_OPTIONS \"log=$EPPATH/test/tmp/httpd.dmalloc.log,debug=0x3f03\" SetEnv DMALLOC_OPTIONS \"log=$EPPATH/test/tmp/httpd.dmalloc.log,debug=0x3f03\" -#Load Embperl first, when mod_perl is staticly linked; +#Load Embperl first, when mod_perl is statically linked; PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\" EOD Modified: perl/embperl/trunk/test/conf/httpd.min.conf.src URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/httpd.min.conf.src?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/test/conf/httpd.min.conf.src (original) +++ perl/embperl/trunk/test/conf/httpd.min.conf.src Mon Sep 10 05:01:48 2012 @@ -8,7 +8,7 @@ print OFH <<EOD ; # # Testconfig for Embperl make test # -# This file is automaticly generated each time you run make test/make start/make stop +# This file is automatically generated each time you run make test/make start/make stop # HostnameLookups off ServerAdmin webmaster Modified: perl/embperl/trunk/test/conf/httpd.stop.conf.src URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/httpd.stop.conf.src?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/test/conf/httpd.stop.conf.src (original) +++ perl/embperl/trunk/test/conf/httpd.stop.conf.src Mon Sep 10 05:01:48 2012 @@ -5,7 +5,7 @@ print OFH <<EOD ; # # Testconfig for Embperl make stop # -# This file is automaticly generated each time you run make test/make start/make stop +# This file is automatically generated each time you run make test/make start/make stop # Modified: perl/embperl/trunk/test/conf/startup.pl URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/startup.pl?rev=1382640&r1=1382639&r2=1382640&view=diff ============================================================================== --- perl/embperl/trunk/test/conf/startup.pl (original) +++ perl/embperl/trunk/test/conf/startup.pl Mon Sep 10 05:01:48 2012 @@ -62,6 +62,13 @@ BEGIN } +# Bug#418067: apache2.2-mpm (at least) doesn't create a new process +# group with apache -X. When exiting though, it SIGTERM's whatever +# the process group happens to be, wreaking havoc. More importantly +# it causes 'make test' to exit with failure. Hack around that here: +use POSIX (); +POSIX::setpgid(0,0); + use Embperl ; use Embperl::Object ; --------------------------------------------------------------------- To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
