--- parser3/src/include/pa_common.h	2017/02/06 16:17:12	1.173
+++ parser3/src/include/pa_common.h	2019/11/13 22:05:48	1.177
@@ -1,14 +1,14 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.173 2017/02/06 16:17:12 moko Exp $"
+#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.177 2019/11/13 22:05:48 moko Exp $"
 
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -39,8 +39,6 @@ class Request;
 #define HTTP_CONTENT_TYPE_MULTIPART_RELATED	"multipart/related"
 #define HTTP_CONTENT_TYPE_MULTIPART_MIXED	"multipart/mixed"
 
-#define BASE64_STRICT_OPTION_NAME "strict"
-
 const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
 
 #define HASH_ORDER
@@ -269,10 +267,6 @@ char *str_upper(const char *s, size_t he
 const char* hex_string(unsigned char* bytes, size_t size, bool upcase);
 extern const char* hex_digits;
 
-void pa_base64_decode(const char *in, size_t in_size, char*& result, size_t& result_size, bool strict=false);
-char* pa_base64_encode(const char *in, size_t in_size);
-char* pa_base64_encode(const String& file_spec);
-
 const char *pa_idna_encode(const char *in, Charset &source);
 const char *pa_idna_decode(const char *in, Charset &source);
 
@@ -293,8 +287,6 @@ extern const String file_status_name;
 
 // global defines for file options which are handled but not checked elsewhere, we check them
 
-#define PA_SQL_LIMIT_NAME "limit"
-#define PA_SQL_OFFSET_NAME "offset"
 #define PA_COLUMN_SEPARATOR_NAME "separator"
 #define PA_COLUMN_ENCLOSER_NAME "encloser"
 #define PA_CHARSET_NAME "charset"
@@ -303,10 +295,19 @@ extern const String file_status_name;
 // globals defines for sql options
 
 #define SQL_BIND_NAME "bind"
+#define PA_SQL_LIMIT_NAME "limit"
+#define PA_SQL_OFFSET_NAME "offset"
 #define SQL_DEFAULT_NAME "default"
 #define SQL_DISTINCT_NAME "distinct"
 #define SQL_VALUE_TYPE_NAME "type"
 
+extern String sql_bind_name;
+extern String sql_limit_name;
+extern String sql_offset_name;
+extern String sql_default_name;
+extern String sql_distinct_name;
+extern String sql_value_type_name;
+
 #ifndef DOXYGEN
 enum Table2hash_distint { D_ILLEGAL, D_FIRST };
 enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE, C_CODE };