CVS update: php3
| From: | zeev | Date: | Mon, 21 Sep 1998 16:41:52 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1329@lists.php.net to get a copy of this message | ||
Date: Monday September 21, 1998 @ 12:41
Author: zeev
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv26796
Modified Files:
ChangeLog Makefile.in language-scanner.lex main.c mod_php3.h
php3.ini-dist
Log Message:
Add optional support for <% %> tags
Update dependencies
Index: php3/ChangeLog
diff -c php3/ChangeLog:1.488 php3/ChangeLog:1.489
*** php3/ChangeLog:1.488 Mon Sep 21 12:03:34 1998
--- php3/ChangeLog Mon Sep 21 12:41:43 1998
***************
*** 1,6 ****
--- 1,7 ----
PHP 3.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Version 3.0.4
+ - Added optional support for ASP-style <% %> tags
- Fixed data loss problems with very large numeric array indices on 64-bit
platforms (e.g. DEC UNIX).
- 2 cursor_type parameters for ifx_query() and ifx_prepare changed
Index: php3/Makefile.in
diff -c php3/Makefile.in:1.260 php3/Makefile.in:1.261
*** php3/Makefile.in:1.260 Fri Sep 18 12:54:57 1998
--- php3/Makefile.in Mon Sep 21 12:41:44 1998
***************
*** 24,30 ****
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.260 1998/09/18 16:54:57 rasmus Exp $
#
prefix = @prefix@
--- 24,30 ----
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.261 1998/09/21 16:41:44 zeev Exp $
#
prefix = @prefix@
***************
*** 264,284 ****
internal_functions_registry.h php3_list.h functions/php3_ifx.h \
functions/php3_ldap.h functions/php3_mysql.h functions/php3_bcmath.h \
functions/php3_msql.h functions/basic_functions.h functions/phpmath.h \
! functions/php3_string.h functions/oracle.h functions/base64.h \
! functions/php3_dir.h functions/dns.h functions/php3_pgsql.h \
! functions/php3_velocis.h functions/php3_sybase.h \
! functions/php3_sybase-ct.h functions/reg.h functions/php3_mail.h \
! functions/imap.h functions/md5.h functions/global.h \
! functions/php3_gd.h functions/html.h functions/dl.h functions/head.h \
! functions/post.h functions/exec.h functions/php3_solid.h \
! functions/adabasd.h functions/file.h functions/dbase.h functions/hw.h \
! functions/filepro.h functions/db.h functions/php3_syslog.h \
! functions/php3_filestat.h functions/php3_browscap.h functions/pack.h \
! php3_debugger.h functions/php3_unified_odbc.h dl/snmp/php3_snmp.h \
functions/php3_zlib.h functions/php3_COM.h
! snprintf.o: snprintf.c config.h php.h php_version.h request_info.h \
! php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
! mod_php3.h stack.h operators.h token_cache.h variables.h constants.h
php3_sprintf.o: php3_sprintf.c config.h
alloc.o: alloc.c alloc.h php.h php_version.h config.h request_info.h \
php3_hash.h safe_mode.h fopen-wrappers.h mod_php3.h \
--- 264,283 ----
internal_functions_registry.h php3_list.h functions/php3_ifx.h \
functions/php3_ldap.h functions/php3_mysql.h functions/php3_bcmath.h \
functions/php3_msql.h functions/basic_functions.h functions/phpmath.h \
! functions/php3_string.h functions/php3_oci8.h functions/oracle.h \
! functions/base64.h functions/php3_dir.h functions/dns.h \
! functions/php3_pgsql.h functions/php3_velocis.h \
! functions/php3_sybase.h functions/php3_sybase-ct.h functions/reg.h \
! functions/php3_mail.h functions/imap.h functions/md5.h \
! functions/global.h functions/php3_gd.h functions/html.h \
! functions/dl.h functions/head.h functions/post.h functions/exec.h \
! functions/php3_solid.h functions/adabasd.h functions/file.h \
! functions/dbase.h functions/hw.h functions/filepro.h functions/db.h \
! functions/php3_syslog.h functions/php3_filestat.h \
! functions/php3_browscap.h functions/pack.h php3_debugger.h \
! functions/php3_unified_odbc.h dl/snmp/php3_snmp.h \
functions/php3_zlib.h functions/php3_COM.h
! snprintf.o: snprintf.c config.h
php3_sprintf.o: php3_sprintf.c config.h
alloc.o: alloc.c alloc.h php.h php_version.h config.h request_info.h \
php3_hash.h safe_mode.h fopen-wrappers.h mod_php3.h \
***************
*** 326,331 ****
--- 325,331 ----
request_info.h php3_hash.h alloc.h safe_mode.h \
fopen-wrappers.h mod_php3.h stack.h operators.h token_cache.h \
variables.h constants.h
+ alloca.o: alloca.c
functions/adabasd.o: functions/adabasd.c config.h build-defs.h php.h \
php_version.h request_info.h php3_hash.h alloc.h \
safe_mode.h fopen-wrappers.h mod_php3.h stack.h operators.h \
***************
*** 462,468 ****
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
internal_functions.h modules.h functions/type.h functions/post.h \
! functions/mime.h
functions/msql.o: functions/msql.c config.h php.h php_version.h request_info.h \
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
--- 462,468 ----
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
internal_functions.h modules.h functions/type.h functions/post.h \
! functions/mime.h php3_list.h
functions/msql.o: functions/msql.c config.h php.h php_version.h request_info.h \
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
***************
*** 478,483 ****
--- 478,487 ----
fopen-wrappers.h mod_php3.h stack.h operators.h token_cache.h \
variables.h constants.h internal_functions.h modules.h \
functions/oracle.h
+ functions/oci8.o: functions/oci8.c php.h php_version.h config.h request_info.h \
+ php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
+ mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
+ internal_functions.h modules.h functions/php3_oci8.h
functions/pack.o: functions/pack.c php.h php_version.h config.h request_info.h \
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
***************
*** 587,608 ****
fopen-wrappers.h mod_php3.h stack.h operators.h token_cache.h \
variables.h constants.h internal_functions.h modules.h \
functions/php3_velocis.h
! functions/gdttf.o: functions/gdttf.c config.h functions/gdttf.h \
! functions/gdcache.h
! functions/gdcache.o: functions/gdcache.c config.h functions/gdcache.h
functions/zlib.o: functions/zlib.c php.h php_version.h config.h request_info.h \
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
functions/head.h modules.h internal_functions.h php3_list.h \
functions/php3_string.h functions/php3_zlib.h snprintf.h
functions/COM.o: functions/COM.c
- functions/ifx.o: functions/ifx.c
functions/hw.o: functions/hw.c config.h php.h php_version.h request_info.h \
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
internal_functions.h modules.h functions/head.h
functions/hg_comm.o: functions/hg_comm.c config.h
functions/dlist.o: functions/dlist.c config.h
# Local Variables:
# tab-width: 4
--- 591,615 ----
fopen-wrappers.h mod_php3.h stack.h operators.h token_cache.h \
variables.h constants.h internal_functions.h modules.h \
functions/php3_velocis.h
! functions/gdttf.o: functions/gdttf.c config.h
! functions/gdcache.o: functions/gdcache.c config.h
functions/zlib.o: functions/zlib.c php.h php_version.h config.h request_info.h \
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
functions/head.h modules.h internal_functions.h php3_list.h \
functions/php3_string.h functions/php3_zlib.h snprintf.h
functions/COM.o: functions/COM.c
functions/hw.o: functions/hw.c config.h php.h php_version.h request_info.h \
php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
internal_functions.h modules.h functions/head.h
functions/hg_comm.o: functions/hg_comm.c config.h
functions/dlist.o: functions/dlist.c config.h
+ functions/snmp.o: functions/snmp.c php.h php_version.h config.h request_info.h \
+ php3_hash.h alloc.h safe_mode.h fopen-wrappers.h \
+ mod_php3.h stack.h operators.h token_cache.h variables.h constants.h \
+ internal_functions.h modules.h functions/php3_snmp.h
+
# Local Variables:
# tab-width: 4
Index: php3/language-scanner.lex
diff -c php3/language-scanner.lex:1.172 php3/language-scanner.lex:1.173
*** php3/language-scanner.lex:1.172 Thu Sep 10 19:56:55 1998
--- php3/language-scanner.lex Mon Sep 21 12:41:46 1998
***************
*** 783,789 ****
}
! <INITIAL>(([^<]|"<"[^?s<]){1,400})|"<s"|"<" {
phplval->value.str.val = (char *) estrndup(yytext, yyleng);
phplval->value.str.len = yyleng;
phplval->type = IS_STRING;
--- 783,789 ----
}
! <INITIAL>(([^<]|"<"[^?%s<]){1,400})|"<s"|"<" {
phplval->value.str.val = (char *) estrndup(yytext, yyleng);
phplval->value.str.len = yyleng;
phplval->type = IS_STRING;
***************
*** 811,816 ****
--- 811,836 ----
}
}
+ <INITIAL>"<%" {
+ if (php3_ini.asp_tags) {
+ if (!(GLOBAL(initialized) & INIT_ENVIRONMENT)) {
+ _php3_hash_environment();
+ }
+ BEGIN(IN_PHP);
+ if (GLOBAL(php3_display_source)) {
+ BEGIN_COLOR(php3_ini.highlight_default);
+ html_puts(yytext,yyleng);
+ }
+ } else {
+ phplval->value.str.val = (char *) estrndup(yytext, yyleng);
+ phplval->value.str.len = yyleng;
+ phplval->type = IS_STRING;
+ HANDLE_NEWLINES(yytext,yyleng);
+ return INLINE_HTML;
+ }
+ }
+
+
<INITIAL>"<?php"[ \n\r\t] {
HANDLE_NEWLINE(yytext[yyleng-1]);
if (!(GLOBAL(initialized) & INIT_ENVIRONMENT)) {
***************
*** 950,955 ****
--- 970,995 ----
}
return ';'; /* implicit ';' at php-end tag */
}
+
+
+ <IN_PHP>"%>"([\n]|"\r\n")? {
+ HANDLE_NEWLINE(yytext[yyleng-1]);
+ if (php3_ini.asp_tags) {
+ BEGIN(INITIAL);
+ if (GLOBAL(php3_display_source)) {
+ html_puts(yytext,yyleng);
+ END_COLOR();
+ }
+ return ';'; /* implicit ';' at php-end tag */
+ } else {
+ phplval->value.str.val = (char *) estrndup(yytext, yyleng);
+ phplval->value.str.len = yyleng;
+ phplval->type = IS_STRING;
+ HANDLE_NEWLINES(yytext,yyleng);
+ return INLINE_HTML;
+ }
+ }
+
<IN_PHP>["] {
BEGIN(DOUBLE_QUOTES);
Index: php3/main.c
diff -c php3/main.c:1.469 php3/main.c:1.470
*** php3/main.c:1.469 Sat Sep 19 07:59:29 1998
--- php3/main.c Mon Sep 21 12:41:47 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 1.469 1998/09/19 11:59:29 zeev Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 1.470 1998/09/21 16:41:47 zeev Exp $ */
/* #define CRASH_DETECTION */
***************
*** 963,968 ****
--- 963,971 ----
}
if (cfg_get_long("short_open_tag", &php3_ini.short_open_tag) == FAILURE) {
php3_ini.short_open_tag = DEFAULT_SHORT_OPEN_TAG;
+ }
+ if (cfg_get_long("asp_tags", &php3_ini.asp_tags) == FAILURE) {
+ php3_ini.asp_tags = 0;
}
if (cfg_get_string("user_dir", &php3_ini.user_dir) == FAILURE) {
if ((temp = getenv("PHP_USER_DIR"))) {
Index: php3/mod_php3.h
diff -c php3/mod_php3.h:1.44 php3/mod_php3.h:1.45
*** php3/mod_php3.h:1.44 Tue Aug 25 15:56:28 1998
--- php3/mod_php3.h Mon Sep 21 12:41:50 1998
***************
*** 26,32 ****
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: mod_php3.h,v 1.44 1998/08/25 19:56:28 rasmus Exp $ */
#ifndef _MOD_PHP3_H
#define _MOD_PHP3_H
--- 26,32 ----
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: mod_php3.h,v 1.45 1998/09/21 16:41:50 zeev Exp $ */
#ifndef _MOD_PHP3_H
#define _MOD_PHP3_H
***************
*** 65,70 ****
--- 65,71 ----
long upload_max_filesize;
char *extension_dir;
long short_open_tag;
+ long asp_tags;
char *debugger_host;
long debugger_port;
char *error_log;
Index: php3/php3.ini-dist
diff -c php3/php3.ini-dist:1.48 php3/php3.ini-dist:1.49
*** php3/php3.ini-dist:1.48 Sat Sep 19 18:33:06 1998
--- php3/php3.ini-dist Mon Sep 21 12:41:50 1998
***************
*** 35,40 ****
--- 35,41 ----
engine = On ; enable PHP 3.0 parser
short_open_tag = On ; allow the <? tag. otherwise, only <?php and <script> tags are
recognized.
+ asp_tags = Off ; allow ASP-style <% %> tags
precision = 14 ; number of significant digits displayed in floating point numbers
y2k_compliance = Off ; whether to be year 2000 compliant (will cause problems with non y2k
compliant browsers)
; Safe Mode
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net