Skip to content

Commit

Permalink
Merge pull request #1 from cmason3/21.12.2-beta
Browse files Browse the repository at this point in the history
21.12.2 beta
  • Loading branch information
cmason3 authored Dec 10, 2021
2 parents 093918c + 1d1cbec commit ce81b7f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2021 Chris Mason ([email protected])
Copyright (c) 2020-2022 Chris Mason ([email protected])

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions jinjafx_server.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3

# JinjaFx Server - Jinja2 Templating Tool
# Copyright (c) 2020-2021 Chris Mason <[email protected]>
# Copyright (c) 2020-2022 Chris Mason <[email protected]>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
Expand All @@ -20,7 +20,7 @@
import jinjafx, os, io, sys, socket, signal, threading, yaml, json, base64, time, datetime
import re, argparse, zipfile, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip

__version__ = '21.12.1'
__version__ = '21.12.2'

try:
import requests
Expand Down Expand Up @@ -296,7 +296,7 @@ def do_POST(self):
r = [ 'text/plain', 500, '500 Internal Server Error\r\n', sys._getframe().f_lineno ]

if 'Content-Length' in self.headers:
if int(self.headers['Content-Length']) < (512 * 1024):
if int(self.headers['Content-Length']) < (2048 * 1024):
postdata = self.rfile.read(int(self.headers['Content-Length']))
self.length = len(postdata)

Expand Down Expand Up @@ -689,7 +689,7 @@ def main(rflag=[0]):

try:
print('JinjaFx Server v' + __version__ + ' - Jinja2 Templating Tool')
print('Copyright (c) 2020-2021 Chris Mason <[email protected]>\n')
print('Copyright (c) 2020-2022 Chris Mason <[email protected]>\n')

parser = ArgumentParser(add_help=False)
parser.add_argument('-s', action='store_true', required=True)
Expand Down
10 changes: 9 additions & 1 deletion www/jinjafx_m.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,15 @@ function getStatusText(code) {
set_status("darkred", "ERROR", "No Template");
return false;
}


var cTemplate = window.cmTemplate.getSearchCursor(/[^\u0000-\u007f]/);
if (cTemplate.findNext()) {
window.cmTemplate.focus();
window.cmTemplate.setSelection(cTemplate.from(), cTemplate.to());
set_status("darkred", "ERROR", "Non ASCII Character in Template");
return false;
}

dt = {};

try {
Expand Down

0 comments on commit ce81b7f

Please sign in to comment.