--- parser3/src/include/pa_common.h	2020/12/03 22:48:09	1.185
+++ parser3/src/include/pa_common.h	2024/10/02 22:54:03	1.194
@@ -1,14 +1,14 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.185 2020/12/03 22:48:09 moko Exp $"
+#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.194 2024/10/02 22:54:03 moko Exp $"
 
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -20,7 +20,6 @@ class Request;
 #define HTTP_STATUS_CAPITALIZED	"Status"
 
 #define HTTP_CONTENT_LENGTH		"content-length"
-#define HTTP_CONTENT_LENGTH_CAPITALIZED	"Content-Length"
 
 #define HTTP_CONTENT_TYPE		"content-type"
 #define HTTP_CONTENT_TYPE_UPPER		"CONTENT-TYPE"
@@ -39,7 +38,7 @@ class Request;
 #define HTTP_CONTENT_TYPE_MULTIPART_RELATED	"multipart/related"
 #define HTTP_CONTENT_TYPE_MULTIPART_MIXED	"multipart/mixed"
 
-const String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
+extern const String content_disposition_filename_name;
 
 #define HASH_ORDER
 
@@ -212,7 +211,7 @@ size_t stdout_write(const void *buf, siz
 
 void check_safe_mode(struct stat finfo, const String& file_spec, const char* fname); 
 
-int file_block_read(const int f, unsigned char* buffer, const size_t size);
+ssize_t file_block_read(const int f, void* buffer, const size_t size);
 
 /** 
 	String related functions
@@ -228,7 +227,7 @@ char *lsplit(char *string, char delim);
 char *lsplit(char **string_ref,char delim);
 char *rsplit(char *string, char delim);
 
-const char* format(double value, const char *fmt);
+const char* format_double(double value, const char *fmt);
 
 char* unescape_chars(const char* cp, int len, Charset* client_charset=0, bool js=false/*true==decode \uXXXX and don't convert '+' to space*/);
 
@@ -244,17 +243,20 @@ void back_slashes_to_slashes(char *s);
 
 size_t strpos(const char *str, const char *substr);
 
-int remove_crlf(char *start, char *end);
+size_t remove_crlf(char *start, char *end);
 
 inline bool pa_isalpha(unsigned char c) { return (((c>='A') && (c<='Z')) || ((c>='a') && (c<='z'))); }
 inline bool pa_isalnum(unsigned char c) { return (((c>='0') && (c<='9')) || pa_isalpha(c)); }
 
+void pa_strncpy(char *dst, const char *src, size_t n);
 char *pa_strcat(const char *a, const char *b, const char *c = 0);
 const char *pa_filename(const char *path);
 
 const char* capitalize(const char* s);
-char *str_lower(const char *s, size_t helper_length=0);
-char *str_upper(const char *s, size_t helper_length=0);
+char *str_lower(const char *s, size_t length);
+char *str_upper(const char *s, size_t length);
+inline char *str_lower(const char *s) { return str_lower(s, strlen(s)); }
+inline char *str_upper(const char *s) { return str_upper(s, strlen(s)); }
 
 const char* hex_string(unsigned char* bytes, size_t size, bool upcase);
 extern const char* hex_digits;