[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Sun Mar 16 20:32:06 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1296 php4/ChangeLog:1.1297 --- php4/ChangeLog:1.1296 Sat Mar 15 20:32:48 2003 +++ php4/ChangeLog Sun Mar 16 20:32:05 2003 @@ -1,3 +1,37 @@ +2003-03-16 Sascha Schumann [EMAIL PROTECTED] + +* (PHP_4) + ext/standard/php_smart_str.h: + Preserve explicit casting semantics from functions, so that you can + also pass void pointers to the macros. + +* ext/standard/php_smart_str.h: + Merge macro changes + +2003-03-16 Marcus Boerger [EMAIL PROTECTED] + +* php.ini-dist + php.ini-recommended + main/main.c: + - disable html_errors per default as suggested by php.ini-xxx + - new error format that does not point to any documentation (if either +not html_errors or no docref_root given e.g.: production boxes and + default) + - documentation update in php.ini-xxx + +2003-03-16 Jani Taskinen [EMAIL PROTECTED] + +* ext/interbase/interbase.c: + WS CS fixes + some TSRM_FETCH() removals + pval - zval + +* (PHP_4_3) + NEWS + ext/interbase/interbase.c: + MFH: - Fixed bug #22709 (crash within interbase when database unavailable) + +* ext/interbase/interbase.c: + - Fixed bug #22709 (crash within interbase when database unavailable) + 2003-03-15 Moriyoshi Koizumi [EMAIL PROTECTED] * tests/lang/bug22592.phpt: @@ -1941,7 +1975,7 @@ * sapi/apache/libpre.c sapi/apache/php_apache_http.h: - Added missing headers and $Id: ChangeLog,v 1.1296 2003/03/16 01:32:48 changelog Exp $ tags. + Added missing headers and $Id: ChangeLog,v 1.1297 2003/03/17 01:32:05 changelog Exp $ tags. * sapi/cgi/config9.m4: MFB: Fixed bug #22356 (Do not add empty -I flags). @@ -2500,7 +2534,7 @@ main/streams/plain_wrapper.c main/streams/streams.c main/streams/userspace.c: - ws fixes + missing $Id: ChangeLog,v 1.1296 2003/03/16 01:32:48 changelog Exp $ tags, headers added + ws fixes + missing $Id: ChangeLog,v 1.1297 2003/03/17 01:32:05 changelog Exp $ tags, headers added 2003-02-19 Corne' Cornelius [EMAIL PROTECTED] @@ -3418,7 +3452,7 @@ * (PHP_4_3) sapi/cgi/cgi_main.c: - Added missing $Id: ChangeLog,v 1.1296 2003/03/16 01:32:48 changelog Exp $ tag + Added missing $Id: ChangeLog,v 1.1297 2003/03/17 01:32:05 changelog Exp $ tag 2003-02-14 Thies C. Arntzen [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 / php.ini-dist php.ini-recommended /main main.c
At 22:10 16.03.2003, Shane Caraveo wrote: Marcus Boerger wrote: helly Sun Mar 16 15:47:56 2003 EDT Modified files: /php4/main main.c /php4php.ini-dist php.ini-recommended Log: - disable html_errors per default as suggested by php.ini-xxx - new error format that does not point to any documentation (if either not html_errors or no docref_root given e.g.: production boxes and default) - documentation update in php.ini-xxx # hope everyone is happy now # and why on earth was enabling html_errors default? Sorry, not so happy. phpinfo() requires html_errors = on to display the info page in html. Something needs to be done about that, since it's awfully anoying to get plain text in that page when going over http. Shane The correct solution is to untie phpinfo() from html_erros marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard php_smart_str.h
sas Sun Mar 16 18:02:20 2003 EDT
Modified files:
/php4/ext/standard php_smart_str.h
Log:
Merge macro changes
Index: php4/ext/standard/php_smart_str.h
diff -u php4/ext/standard/php_smart_str.h:1.23 php4/ext/standard/php_smart_str.h:1.24
--- php4/ext/standard/php_smart_str.h:1.23 Tue Dec 31 11:07:53 2002
+++ php4/ext/standard/php_smart_str.h Sun Mar 16 18:02:19 2003
@@ -24,120 +24,147 @@
#include stdlib.h
#include zend.h
-#define smart_str_0(x) do { if ((x)-c) { (x)-c[(x)-len] = '\0'; } } while (0)
+#define smart_str_0(x) do {
\
+ if ((x)-c) {
\
+ (x)-c[(x)-len] = '\0';
\
+ }
\
+} while (0)
#ifndef SMART_STR_PREALLOC
#define SMART_STR_PREALLOC 128
#endif
-#define smart_str_alloc(d, n, what) {\
- if (!d-c) d-len = d-a = 0; \
- newlen = d-len + n; \
- if (newlen = d-a) {\
- d-c = perealloc(d-c, newlen + SMART_STR_PREALLOC + 1, what); \
- d-a = newlen + SMART_STR_PREALLOC; \
- }\
-}
-
-#define smart_str_appends_ex(dest, src, what) smart_str_appendl_ex(dest, src,
strlen(src), what)
-#define smart_str_appends(dest, src) smart_str_appendl(dest, src, strlen(src))
-
-#define smart_str_appendc(dest, c) smart_str_appendc_ex(dest, c, 0)
-#define smart_str_free(s) smart_str_free_ex(s, 0)
-#define smart_str_appendl(dest, src, len) smart_str_appendl_ex(dest, src, len, 0)
-#define smart_str_append(dest, src) smart_str_append_ex(dest, src, 0)
-#define smart_str_append_long(dest, val) smart_str_append_long_ex(dest, val, 0)
-#define smart_str_append_unsigned(dest, val) smart_str_append_unsigned_ex(dest, val,
0)
-
-static inline void smart_str_appendc_ex(smart_str *dest, unsigned char c, int what)
-{
- size_t newlen;
-
- smart_str_alloc(dest, 1, what);
- dest-len = newlen;
- ((unsigned char *) dest-c)[dest-len - 1] = c;
-}
-
-
-static inline void smart_str_free_ex(smart_str *s, int what)
-{
- if (s-c) {
- pefree(s-c, what);
- s-c = NULL;
- }
- s-a = s-len = 0;
-}
-
-static inline void smart_str_appendl_ex(smart_str *dest, const char *src, size_t len,
int what)
-{
- size_t newlen;
-
- smart_str_alloc(dest, len, what);
- memcpy(dest-c + dest-len, src, len);
- dest-len = newlen;
-}
-
-/* buf points to the END of the buffer */
-static inline char *smart_str_print_unsigned(char *buf, unsigned long num)
-{
- char *p = buf;
-
- *p = '\0';
- do {
- *--p = (char)(num % 10) + '0';
- num /= 10;
- } while (num 0);
-
- return p;
-}
+#define smart_str_alloc4(d, n, what, newlen) do {
\
+ if (!(d)-c) (d)-len = (d)-a = 0;
\
+ newlen = (d)-len + (n);
\
+ if (newlen = (d)-a) {
\
+ (d)-a = newlen + SMART_STR_PREALLOC;
\
+ (d)-c = perealloc((d)-c, (d)-a + 1, (what));
\
+ }
\
+} while (0)
+
+#define smart_str_alloc(d, n, what) \
+ smart_str_alloc4((d), (n), (what), newlen)
+
+/* wrapper */
+
+#define smart_str_appends_ex(dest, src, what) \
+ smart_str_appendl_ex((dest), (src), strlen(src), (what))
+#define smart_str_appends(dest, src) \
+ smart_str_appendl((dest), (src), strlen(src))
+
+#define smart_str_appendc(dest, c) \
+ smart_str_appendc_ex((dest), (c), 0)
+#define smart_str_free(s) \
+ smart_str_free_ex((s), 0)
+#define smart_str_appendl(dest, src, len) \
+ smart_str_appendl_ex((dest), (src), (len), 0)
+#define smart_str_append(dest, src) \
+ smart_str_append_ex((dest), (src), 0)
+#define smart_str_append_long(dest, val) \
+ smart_str_append_long_ex((dest), (val), 0)
+#define smart_str_append_off_t(dest, val) \
+ smart_str_append_off_t_ex((dest), (val), 0)
+#define smart_str_append_unsigned(dest, val) \
+ smart_str_append_unsigned_ex((dest), (val), 0)
+
+#define smart_str_appendc_ex(dest, ch, what) do {
\
+ register size_t __nl;
\
+ smart_str_alloc4((dest), 1, (what), __nl);
[PHP-CVS] cvs: php4(PHP_4) /ext/standard php_smart_str.h
sas Sun Mar 16 18:03:46 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/standard php_smart_str.h
Log:
Preserve explicit casting semantics from functions, so that you can
also pass void pointers to the macros.
Index: php4/ext/standard/php_smart_str.h
diff -u php4/ext/standard/php_smart_str.h:1.22.4.1.2.1
php4/ext/standard/php_smart_str.h:1.22.4.1.2.2
--- php4/ext/standard/php_smart_str.h:1.22.4.1.2.1 Sat Mar 8 09:37:25 2003
+++ php4/ext/standard/php_smart_str.h Sun Mar 16 18:03:46 2003
@@ -76,19 +76,21 @@
} while (0)
#define smart_str_free_ex(s, what) do {
\
- if ((s)-c) {
\
- pefree((s)-c, what);
\
- (s)-c = NULL;
\
+ smart_str *__s = (smart_str *) (s);
\
+ if (__s-c) {
\
+ pefree(__s-c, what);
\
+ __s-c = NULL;
\
}
\
- (s)-a = (s)-len = 0;
\
+ __s-a = __s-len = 0;
\
} while (0)
#define smart_str_appendl_ex(dest, src, nlen, what) do { \
register size_t __nl;
\
+ smart_str *__dest = (smart_str *) (dest);
\
\
- smart_str_alloc4((dest), (nlen), (what), __nl);
\
- memcpy((dest)-c + (dest)-len, (src), (nlen));
\
- (dest)-len = __nl;
\
+ smart_str_alloc4(__dest, (nlen), (what), __nl);
\
+ memcpy(__dest-c + __dest-len, (src), (nlen));
\
+ __dest-len = __nl;
\
} while (0)
/* input: buf points to the END of the buffer */
@@ -152,7 +154,8 @@
smart_str_append_generic_ex((dest), (num), (type), off_t, _long)
#define smart_str_append_ex(dest, src, what) \
- smart_str_appendl_ex((dest), (src)-c, (src)-len, (what));
+ smart_str_appendl_ex((dest), ((smart_str *)(src))-c, \
+ ((smart_str *)(src))-len, (what));
#define smart_str_setl(dest, src, nlen) do {
\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / php.ini-dist php.ini-recommended /mainmain.c
On Sun, 16 Mar 2003, Marcus [iso-8859-1] Börger wrote: At 22:10 16.03.2003, Shane Caraveo wrote: Marcus Boerger wrote: helly Sun Mar 16 15:47:56 2003 EDT Modified files: /php4/main main.c /php4php.ini-dist php.ini-recommended Log: - disable html_errors per default as suggested by php.ini-xxx - new error format that does not point to any documentation (if either not html_errors or no docref_root given e.g.: production boxes and default) - documentation update in php.ini-xxx # hope everyone is happy now # and why on earth was enabling html_errors default? Sorry, not so happy. phpinfo() requires html_errors = on to display the info page in html. Something needs to be done about that, since it's awfully anoying to get plain text in that page when going over http. The correct solution is to untie phpinfo() from html_erros not really... HTML errors should be on by default as it was. It takes care of formatting the message for users. Why should this be turned off at all? Derick -- my other box is your windows PC - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
