--- parser3/bin/Attic/auto.p.dist.in	2002/09/17 11:24:20	1.8
+++ parser3/bin/Attic/auto.p.dist.in	2020/11/30 17:17:30	1.21
@@ -1,128 +1,171 @@
-#$Id: auto.p.dist.in,v 1.8 2002/09/17 11:24:20 paf Exp $
+#$Id: auto.p.dist.in,v 1.21 2020/11/30 17:17:30 moko Exp $
 
-@conf[]
-$charsetsdir[@charsetsdir@]
-$sqldriversdir[@sqldriversdir@]
+@conf[filespec]
+$confdir[^file:dirname[$filespec]]
+$charsetsdir[$confdir/charsets]
+$sqldriversdir[$confdir/lib]
 
 $CHARSETS[
-@commentcharset_koi8r@    $.koi8-r[$charsetsdir/koi8-r.cfg]
-@commentcharset_windows1250@    $.windows-1250[$charsetsdir/windows-1250.cfg]
-@commentcharset_windows1251@    $.windows-1251[$charsetsdir/windows-1251.cfg]
-@commentcharset_windows1257@    $.windows-1257[$charsetsdir/windows-1257.cfg]
+#	$.cp866[$charsetsdir/cp866.cfg]
+#	$.koi8-r[$charsetsdir/koi8-r.cfg]
+#	$.koi8-u[$charsetsdir/koi8-u.cfg]
+#	$.windows-1250[$charsetsdir/windows-1250.cfg]
+#	$.windows-1251[$charsetsdir/windows-1251.cfg]
+#	$.windows-1254[$charsetsdir/windows-1254.cfg]
+#	$.windows-1257[$charsetsdir/windows-1257.cfg]
+#	$.x-mac-cyrillic[$charsetsdir/x-mac-cyrillic.cfg]
 ]
-#change your client libraries paths to 
those on your system
+
+#change your client libraries paths to those on your system
 $SQL[
-	$.drivers[^table::set{protocol	driver	client
-mysql	$sqldriversdir/libparser3mysql.@dll_extension@	@mysql_client@
-pgsql	$sqldriversdir/libparser3pgsql.@dll_extension@	@pgsql_client@
-oracle	$sqldriversdir/libparser3oracle.@dll_extension@	@oracle_client@
+	$.drivers[^table::create{protocol	driver	client
+mysql	$sqldriversdir/libparser3mysql.@dll_extension@	libmysqlclient.@dll_extension@
+#sqlite	$sqldriversdir/libparser3sqlite.@dll_extension@	libsqlite3.@dll_extension@
+#pgsql	$sqldriversdir/libparser3pgsql.@dll_extension@	libpq.@dll_extension@
+#oracle	$sqldriversdir/libparser3oracle.@dll_extension@	libclntsh.@dll_extension@
 }]
 ]
 
-#for ^file:load[name;user-name] mime-type autodetection
-$MIME-TYPES[^table::set{ext	mime-type
-zip	application/zip
+#for ^file::load[name;user-name] mime-type autodetection
+$MIME-TYPES[^table::create{ext	mime-type
+7z	application/x-7z-compressed
+avi	video/x-msvideo
+bmp	image/bmp
+css	text/css
+cvs	text/csv
 doc	application/msword
-xls	application/vnd.ms-excel
-pdf	application/pdf
-ppt	application/powerpoint
-rtf	application/rtf
+docx	application/vnd.openxmlformats-officedocument.wordprocessingml.document
+dtd	application/xml-dtd
 gif	image/gif
-jpg	image/jpeg
+gz	application/x-gzip
+htm	text/html
+html	text/html
+ico	image/x-icon
 jpeg	image/jpeg
+jpg	image/jpeg
+js	application/javascript
+json	application/json
+log	text/plain
+mov	video/quicktime
+mp3	audio/mpeg
+mp4	video/mp4
+mpg	video/mpeg
+mpeg	video/mpeg
+mts	application/metastream
+otf	font/otf
+pdf	application/pdf
 png	image/png
+ppt	application/powerpoint
+rar	application/vnd.rar
+rdf	application/rdf+xml
+rss	application/rss+xml
+rtf	application/rtf
+svg	image/svg+xml
+tar	application/x-tar
+tgz	application/x-gzip
 tif	image/tiff
-html	text/html
-htm	text/html
+tiff	image/tiff
+ttf	font/ttf
 txt	text/plain
-xml	text/xml
-mts	application/metastream
-mid	audio/midi
-midi	audio/midi
-mp3	audio/mpeg
-ram	audio/x-pn-realaudio
-rpm	audio/x-pn-realaudio-plugin
-ra	audio/x-realaudio
 wav	audio/x-wav
-au	audio/basic
-mpg	video/mpeg
-avi	video/x-msvideo
-mov	video/quicktime
-swf	application/x-shockwave-flash
+xls	application/vnd.ms-excel
+xlsx	application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+xml	text/xml
+xsl	text/xml
+webm	video/webm
+webp	image/webp
+woff	font/woff
+woff2	font/woff2
+zip	application/zip
 }]
 
 $LIMITS[
 	$.post_max_size(10*0x400*0x400)
-]	
+]
 
 #$MAIL[
 #	$.sendmail[your sendmail command goes here]
 #	these are tried when no 'sendmail' specified:
-#	    /usr/sbin/sendmail -t -i -f postmaster
-#	    /usr/lib/sendmail -t -i -f postmaster
+#		/usr/sbin/sendmail -t -i -f postmaster
+#		/usr/lib/sendmail -t -i -f postmaster
 #]
 
-@fatal_error[title;body]
+
+@fatal_error[title;subtitle;body]
 $response:status(500)
 $response:content-type[
-        $.value[text/html]
-        $.charset[$response:charset]
+	$.value[text/html]
+	$.charset[$response:charset]
 ]
 <html>
 <head><title>$title</title></head>
 <body>
-<H1>$title</H1>
+<h1>^if(def $subtitle){$subtitle;$title}</h1>
 $body
 #for [x] MSIE friendly
 ^for[i](0;512/8){<!-- -->}
 </body>
+</html>
 
-@unhandled_exception_debug[exception;stack]
-^fatal_error[Unhandled Exception (Debug);
 
+@unhandled_exception_debug[exception;stack]
+^fatal_error[Unhandled Exception^if(def $exception.type){ ($exception.type)};$exception.source;
 <pre>^untaint[html]{$exception.comment}</pre>
-^if(def $exception.source){
-<b>$exception.source</b><br>
-<pre>^untaint[html]{$exception.file^($exception.lineno^)}</pre>
+^if(def $exception.file){
+	^untaint[html]{<tt>$exception.file^(${exception.lineno}:$exception.colno^)</tt>}
 }
-^if(def $exception.type){exception.type=$exception.type}
 ^if($stack){
-	<hr>
+	<hr/>
+	<table>
 	^stack.menu{
-		<tt>$stack.name</tt> $stack.file^($stack.lineno^)<br>
+		<tr><td>$stack.name</td><td><tt>$stack.file^(${stack.lineno}:$stack.colno^)</tt></td></tr>
 	}
+	</table>
 }
-
 ]
 
+
 @unhandled_exception_release[exception;stack]
-^fatal_error[Unhandled Exception;
+^fatal_error[Unhandled Exception;;
 
-<p>The server encountered an unhandled exception 
-and was unable to complete your request.</p>
-<p>Please contact the server administrator, $env:SERVER_ADMIN
-and inform them of the time the error occurred, 
-and anything you might have done that may have caused the error.</p>
-<p>More information about this error may be available in the Parser error log
-or in debug version of unhandled_exception.</p>
+<p>The server encountered an unhandled exception and was unable to complete your request.</p>
+<p>Please contact the server administrator, $env:SERVER_ADMIN and inform them of the time the error occurred, and anything you might have done that may have caused the error.</p>
+<p>More information about this error may be available in the Parser error log or in debug version of unhandled_exception.</p>
 
 ]
 
+
+@is_developer[]
+#change mask to your ip address
+$result(def $env:REMOTE_ADDR && ^env:REMOTE_ADDR.match[^^127\.0\.0\.1^$])
+
+
 @unhandled_exception[exception;stack]
-^unhandled_exception_release[$exception;$stack]
+#developer? use debug version to see problem details
+^if(^is_developer[]){
+	^unhandled_exception_debug[$exception;$stack]
+}{
+	^if($exception.type eq "file.missing"){
+#		^log404[]
+#		^location[/404/]
+		$response:status(404)
+	}{
+		^unhandled_exception_release[$exception;$stack]
+	}
+}
 
 
 @auto[]
 #source/client charsets
-$request:charset[windows-1251]
-$response:charset[windows-1251]
+$request:charset[utf-8]
+$response:charset[utf-8]
 
 $response:content-type[
-        $.value[text/html]
-        $.charset[$response:charset]
+	$.value[text/html]
+	$.charset[$response:charset]
 ]
 
-#$SQL.connect-string[mysql://user:pass@host/db?charset=cp1251_koi8]
+#$SQL.connect-string[mysql://user:pass@host/db?charset=utf8]
+#$SQL.connect-string[sqlite://db]
 #$SQL.connect-string[pgsql://user:pass@host/db]
-#$SQL.connect-string[oracle://user:pass@service?NLS_LANG=RUSSIAN_AMERICA.CL8MSWIN1251&NLS_DATE_FORMAT=YYYY-MM-DD HH24:MI:SS]
 #$SQL.connect-string[odbc://DSN=datasource^;UID=user^;PWD=password]