Alex, here is my original patch file. Do I have the wrong version or
something? The line you gave me to replace is already there.
--- Patch file start
--- language-scanner.lex-unscript Wed Jun 14 07:50:55 2000
+++ language-scanner.lex Wed Jun 14 07:55:12 2000
@@ -35,6 +35,7 @@
%}
%x IN_PHP
+%x IN_SCRIPT
%x DOUBLE_QUOTES
%x SINGLE_QUOTE
%x BACKQUOTE
@@ -915,7 +916,7 @@
return yytext[0];
}
-<INITIAL>(([^<&]|"<"[^?%s<[(]|"&"[^(]){1,400})|"<s"|"<"|"&" {
+<INITIAL,IN_SCRIPT>(([^<&]|"<"[^?%s<[(]|"&"[^(]){1,400})|"<s"|"<"|"&"[^<]|"&<"[^?]
{
phplval->value.str.val = (char *) estrndup(yytext, yyleng);
phplval->value.str.len = yyleng;
phplval->type = IS_STRING;
@@ -923,7 +924,7 @@
return INLINE_HTML;
}
-<INITIAL>"<?"|"<script"{WHITESPACE}+"language"{WHITESPACE}*"="{WHITESPACE}*("php"|"\"php\""|"\'php\'"){WHITESPACE}*">"
{
+<INITIAL,IN_SCRIPT>"<?"|"<script"{WHITESPACE}+"language"{WHITESPACE}*"="{WHITESPACE}*("php"|"\"php\""|"\'php\'"){WHITESPACE}*">"
{
if (php3_ini.short_open_tag || yyleng>2) { /* yyleng>2 means it's not <? but
<script> */
if (!(GLOBAL(initialized) & INIT_ENVIRONMENT)) {
_php3_hash_environment();
@@ -943,7 +944,15 @@
}
}
-<INITIAL>"<%"("=")? {
+<INITIAL>"<script"{WHITESPACE}+"language"{WHITESPACE}*"="{WHITESPACE}* {
+ BEGIN(IN_SCRIPT);
+ phplval->value.str.val = (char *) estrndup(yytext, yyleng);
+ phplval->value.str.len = yyleng;
+ phplval->type = IS_STRING;
+ return INLINE_HTML;
+}
+
+<INITIAL,IN_SCRIPT>"<%"("=")? {
if (php3_ini.asp_tags) {
if (!(GLOBAL(initialized) & INIT_ENVIRONMENT)) {
_php3_hash_environment();
@@ -966,7 +975,7 @@
}
-<INITIAL>"<?php"[ \n\r\t] {
+<INITIAL,IN_SCRIPT>"<?php"[ \n\r\t] {
HANDLE_NEWLINE(yytext[yyleng-1]);
if (!(GLOBAL(initialized) & INIT_ENVIRONMENT)) {
_php3_hash_environment();
@@ -978,7 +987,7 @@
)
}
-<INITIAL>"<?php_track_vars?>"([\n]|"\r\n")? {
+<INITIAL,IN_SCRIPT>"<?php_track_vars?>"([\n]|"\r\n")? {
GLOBAL(php3_track_vars)=1;
HANDLE_NEWLINE(yytext[yyleng-1]);
IF_DISPLAY_SOURCE(
@@ -1106,6 +1115,13 @@
return ';'; /* implicit ';' at php-end tag */
}
+<IN_SCRIPT>"</script"{WHITESPACE}*">" {
+ BEGIN(INITIAL);
+ phplval->value.str.val = (char *) estrndup(yytext, yyleng);
+ phplval->value.str.len = yyleng;
+ phplval->type = IS_STRING;
+ return INLINE_HTML;
+}
<IN_PHP>"%>"([\n]|"\r\n")? {
HANDLE_NEWLINE(yytext[yyleng-1]);
@@ -1297,7 +1313,7 @@
}
-<DOUBLE_QUOTES,BACKQUOTE,INITIAL,IN_PHP><<EOF>> {
+<DOUBLE_QUOTES,BACKQUOTE,INITIAL,IN_PHP,IN_SCRIPT><<EOF>> {
int retval;
if (end_current_file_execution(&retval)) {
@@ -1308,6 +1324,6 @@
-<IN_PHP,INITIAL,DOUBLE_QUOTES,BACKQUOTE,SINGLE_QUOTE>. {
+<IN_PHP,INITIAL,DOUBLE_QUOTES,BACKQUOTE,SINGLE_QUOTE,IN_SCRIPT>. {
php3_error(E_WARNING,"Unexpected character in input: '%c' (ASCII=%d)
state=%d",yytext[0],yytext[0],YYSTATE);
}
--- Patch file end
--- Alexander Bokovoy <[EMAIL PROTECTED]> wrote:
> Hello Derek,
>
> Wednesday, June 28, 2000, 9:35:34 PM, you wrote:
>
> > I ran the patch for the Javascript problem in the midgard-php-1.2.6-beta2
> > directory and received the following errors.
> > ***************
> > *** 915,921 ****
> > return yytext[0];
> > }
>
> > - <INITIAL>(([^<&]|"<"[^?%s<[(]|"&"[^(]){1,400})|"<s"|"<"|"&" {
> Replace this line with the next one:
> >
>
<INITIAL,IN_SCRIPT>(([^<&]|"<"[^?%s<[(]|"&"[^(]){1,400})|"<s"|"<"|"&"[^<]|"&<"[^?]
>
> --
> Best regards,
> Alexander mailto:[EMAIL PROTECTED]
>
>
>
> --
> This is The Midgard Project's mailing list. For more information,
> please visit the project's web site at http://www.midgard-project.org
>
> To unsubscribe the list, send an empty email message to address
> [EMAIL PROTECTED]
>
=====
. \\|//
(O-O)
*--------------------------------------oOO--(_)--OOo-----*
* Sender: Derek Beattie *
* Personal: [EMAIL PROTECTED] *
* Business: [EMAIL PROTECTED] *
*--------------------------------------------------------*
__________________________________________________
Do You Yahoo!?
Get Yahoo! Mail - Free email you can access from anywhere!
http://mail.yahoo.com/
--
This is The Midgard Project's mailing list. For more information,
please visit the project's web site at http://www.midgard-project.org
To unsubscribe the list, send an empty email message to address
[EMAIL PROTECTED]
