[PHP-CVS] cvs: php-src(PHP_5_2) /main snprintf.c spprintf.c
tony2001Fri Aug 3 14:31:28 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main snprintf.c spprintf.c
Log:
'I32' and 'I' support
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.13&r2=1.37.2.4.2.14&diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.13
php-src/main/snprintf.c:1.37.2.4.2.14
--- php-src/main/snprintf.c:1.37.2.4.2.13 Mon Jun 25 08:39:10 2007
+++ php-src/main/snprintf.c Fri Aug 3 14:31:27 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.37.2.4.2.13 2007/06/25 08:39:10 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.14 2007/08/03 14:31:27 tony2001 Exp $ */
#include "php.h"
@@ -716,7 +716,16 @@
modifier = LM_LONG_LONG;
} else
#endif
- modifier = LM_LONG;
+ if (*fmt == '3' && *(fmt+1) ==
'2') {
+ fmt += 2;
+ modifier = LM_LONG;
+ } else {
+#ifdef _WIN64
+ modifier = LM_LONG_LONG;
+#else
+ modifier = LM_LONG;
+#endif
+ }
break;
case 'l':
fmt++;
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.9&r2=1.25.2.2.2.10&diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.25.2.2.2.9
php-src/main/spprintf.c:1.25.2.2.2.10
--- php-src/main/spprintf.c:1.25.2.2.2.9Fri Aug 3 09:51:12 2007
+++ php-src/main/spprintf.c Fri Aug 3 14:31:28 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.25.2.2.2.9 2007/08/03 09:51:12 tony2001 Exp $ */
+/* $Id: spprintf.c,v 1.25.2.2.2.10 2007/08/03 14:31:28 tony2001 Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -312,7 +312,16 @@
modifier = LM_LONG_LONG;
} else
#endif
- modifier = LM_LONG;
+ if (*fmt == '3' && *(fmt+1) ==
'2') {
+ fmt += 2;
+ modifier = LM_LONG;
+ } else {
+#ifdef _WIN64
+ modifier = LM_LONG_LONG;
+#else
+ modifier = LM_LONG;
+#endif
+ }
break;
case 'l':
fmt++;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main snprintf.c spprintf.c
tony2001Fri Aug 3 14:30:59 2007 UTC
Modified files:
/php-src/main snprintf.c spprintf.c
Log:
'I32' and 'I' support (per request by Marcus)
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.57&r2=1.58&diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.57 php-src/main/snprintf.c:1.58
--- php-src/main/snprintf.c:1.57Mon Jun 25 08:39:23 2007
+++ php-src/main/snprintf.c Fri Aug 3 14:30:59 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.57 2007/06/25 08:39:23 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.58 2007/08/03 14:30:59 tony2001 Exp $ */
#include "php.h"
@@ -714,7 +714,16 @@
modifier = LM_LONG_LONG;
} else
#endif
- modifier = LM_LONG;
+ if (*fmt == '3' && *(fmt+1) ==
'2') {
+ fmt += 2;
+ modifier = LM_LONG;
+ } else {
+#ifdef _WIN64
+ modifier = LM_LONG_LONG;
+#else
+ modifier = LM_LONG;
+#endif
+ }
break;
case 'l':
fmt++;
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.48&r2=1.49&diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.48 php-src/main/spprintf.c:1.49
--- php-src/main/spprintf.c:1.48Fri Aug 3 09:51:05 2007
+++ php-src/main/spprintf.c Fri Aug 3 14:30:59 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.48 2007/08/03 09:51:05 tony2001 Exp $ */
+/* $Id: spprintf.c,v 1.49 2007/08/03 14:30:59 tony2001 Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -347,7 +347,16 @@
modifier = LM_LONG_LONG;
} else
#endif
- modifier = LM_LONG;
+ if (*fmt == '3' && *(fmt+1) ==
'2') {
+ fmt += 2;
+ modifier = LM_LONG;
+ } else {
+#ifdef _WIN64
+ modifier = LM_LONG_LONG;
+#else
+ modifier = LM_LONG;
+#endif
+ }
break;
case 'l':
fmt++;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Fri Aug 3 16:50:25 2007 UTC Modified files: /CVSROOTavail Log: - guenter karma for gd, maintain netware port http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1294&r2=1.1295&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1294 CVSROOT/avail:1.1295 --- CVSROOT/avail:1.1294Thu Aug 2 14:17:54 2007 +++ CVSROOT/avail Fri Aug 3 16:50:25 2007 @@ -307,6 +307,6 @@ # Please ask [EMAIL PROTECTED] before adding some unknown guys :) # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) -avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac|gd +avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter|gd # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_portability.h mysqlnd_priv.h mysqlnd_ps.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_statistics.h mysqlnd_wirepro
andrey Fri Aug 3 16:32:27 2007 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd.c mysqlnd.h mysqlnd_portability.h
mysqlnd_priv.h mysqlnd_ps.c mysqlnd_ps_codec.c
mysqlnd_result.c mysqlnd_result_meta.c
mysqlnd_statistics.h mysqlnd_wireprotocol.c
mysqlnd_wireprotocol.h
Log:
Update CVS
- Fix BIT problem for BIT values represented with 5 bytes. Typo.
- Make it possible with an ini variable to switch off/on statistics
collection.
- Compile-out debug checking of uneaten data from the line, when the
build is release. According to callgrind this was eating some percentage.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.1 php-src/ext/mysqlnd/mysqlnd.c:1.2
--- php-src/ext/mysqlnd/mysqlnd.c:1.1 Wed Jul 25 23:47:32 2007
+++ php-src/ext/mysqlnd/mysqlnd.c Fri Aug 3 16:32:26 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd.c,v 1.1 2007/07/25 23:47:32 jani Exp $ */
+/* $Id: mysqlnd.c,v 1.2 2007/08/03 16:32:26 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
@@ -67,31 +67,37 @@
MYSQLND_STATS *mysqlnd_global_stats = NULL;
static zend_bool mysqlnd_library_initted = FALSE;
-
/* {{{ mysqlnd_library_init */
-PHPAPI void mysqlnd_library_init()
+static
+void mysqlnd_library_init(zend_bool collect_statistics)
{
if (mysqlnd_library_initted == FALSE) {
mysqlnd_library_initted = TRUE;
_mysqlnd_init_ps_subsystem();
- mysqlnd_global_stats = calloc(1, sizeof(MYSQLND_STATS));
+ if (collect_statistics) {
+ mysqlnd_global_stats = calloc(1, sizeof(MYSQLND_STATS));
+
#ifdef ZTS
- mysqlnd_global_stats->LOCK_access = tsrm_mutex_alloc();
+ mysqlnd_global_stats->LOCK_access = tsrm_mutex_alloc();
#endif
+ }
}
}
/* }}} */
/* {{{ mysqlnd_library_end */
-PHPAPI void mysqlnd_library_end()
+static
+void mysqlnd_library_end()
{
if (mysqlnd_library_initted == TRUE) {
+ if (mysqlnd_global_stats) {
#ifdef ZTS
- tsrm_mutex_free(mysqlnd_global_stats->LOCK_access);
+ tsrm_mutex_free(mysqlnd_global_stats->LOCK_access);
#endif
- free(mysqlnd_global_stats);
- mysqlnd_global_stats = NULL;
+ free(mysqlnd_global_stats);
+ mysqlnd_global_stats = NULL;
+ }
mysqlnd_library_initted = FALSE;
}
}
@@ -1554,26 +1560,6 @@
/* }}} */
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(mysqlnd)
-{
- mysqlnd_library_init();
- return SUCCESS;
-}
-/* }}} */
-
-
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(mysqlnd)
-{
- mysqlnd_library_end();
- return SUCCESS;
-}
-/* }}} */
-
-
/* {{{ mysqlnd_minfo_print_hash */
#if PHP_MAJOR_VERSION >= 6
PHPAPI void mysqlnd_minfo_print_hash(zval *values)
@@ -1654,10 +1640,53 @@
/* }}} */
+ZEND_DECLARE_MODULE_GLOBALS(mysqlnd)
+
+/* {{{ PHP_GINIT_FUNCTION
+ */
+static PHP_GINIT_FUNCTION(mysqlnd)
+{
+ mysqlnd_globals->collect_statistics = FALSE;
+}
+/* }}} */
+
+
+/* {{{ PHP_INI_BEGIN
+*/
+PHP_INI_BEGIN()
+ STD_PHP_INI_BOOLEAN("mysqlnd.collect_statistics", "1", PHP_INI_SYSTEM,
OnUpdateBool, collect_statistics, zend_mysqlnd_globals, mysqlnd_globals)
+PHP_INI_END()
+/* }}} */
+
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(mysqlnd)
+{
+ REGISTER_INI_ENTRIES();
+
+ mysqlnd_library_init(MYSQLND_G(collect_statistics));
+ return SUCCESS;
+}
+/* }}} */
+
+
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(mysqlnd)
+{
+ mysqlnd_library_end();
+
+ UNREGISTER_INI_ENTRIES();
+ return SUCCESS;
+}
+/* }}} */
+
+
/* {{{ mysqlnd_module_entry
*/
zend_module_entry mysqlnd_module_entry = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER,
"mysqlnd",
mysqlnd_functions,
PHP_MINIT(mysqlnd),
@@ -1666,7 +1695,11 @@
NULL,
PHP_MINFO(mysqlnd),
MYSQLND_VERSION,
- STANDARD_MODULE_PROPERTIES
+ PHP_MODULE_GLOBALS(mysqlnd),
+ PHP_GINIT(mysqlnd),
+ NULL,
+ NULL,
+ STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.1 php-src/ext/mysqlnd/mysqlnd.h:1.2
--- php-src/ext/mysqlnd/mysqlnd.h:1.1 Wed Jul 25 23:47:32 2007
+++ php-src/ext/mysqlnd/mysqlnd.h Fri Aug 3 16:32:26 2007
@@ -18,12 +18,12 @@
+
[PHP-CVS] cvs: php-src(PHP_5_2) / Makefile.global
janiFri Aug 3 14:01:56 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcMakefile.global Log: MFH: fix for broken shells http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.13&r2=1.57.2.5.2.14&diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.5.2.13 php-src/Makefile.global:1.57.2.5.2.14 --- php-src/Makefile.global:1.57.2.5.2.13 Thu Jul 26 22:45:59 2007 +++ php-src/Makefile.global Fri Aug 3 14:01:56 2007 @@ -69,8 +69,8 @@ PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' PHP_TEST_SHARED_EXTENSIONS = ` \ - if test "$(PHP_MODULES)"; then \ - for i in $(PHP_MODULES); do \ + if test "x$(PHP_MODULES)" != "x"; then \ + for i in $(PHP_MODULES)""; do \ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ done; \ fi` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / Makefile.global
janiFri Aug 3 14:01:40 2007 UTC Modified files: /php-srcMakefile.global Log: - Fix issue with broken shells # I truly hate Solaris.. http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.84&r2=1.85&diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.84 php-src/Makefile.global:1.85 --- php-src/Makefile.global:1.84Thu Jul 26 22:45:22 2007 +++ php-src/Makefile.global Fri Aug 3 14:01:40 2007 @@ -69,8 +69,8 @@ PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' PHP_TEST_SHARED_EXTENSIONS = ` \ - if test "$(PHP_MODULES)"; then \ - for i in $(PHP_MODULES); do \ + if test "x$(PHP_MODULES)" != "x"; then \ + for i in $(PHP_MODULES)""; do \ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ done; \ fi` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2handler apache_config.c
Hello Stanislav,
Friday, August 3, 2007, 3:14:23 AM, you wrote:
> stasFri Aug 3 01:14:23 2007 UTC
> Modified files: (Branch: PHP_5_2)
> /php-src/sapi/apache2handlerapache_config.c
> Log:
> implement separate .htaccess stage
>
>
> http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.7.2.1.2.2&r2=1.7.2.1.2.3&diff_format=u
> Index: php-src/sapi/apache2handler/apache_config.c
> diff -u php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.2
> php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.3
> --- php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.2 Mon Jan 1
> 09:36:12 2007
> +++ php-src/sapi/apache2handler/apache_config.c Fri Aug 3 01:14:23 2007
> @@ -16,7 +16,7 @@
> +--+
> */
>
> -/* $Id: apache_config.c,v 1.7.2.1.2.2 2007/01/01 09:36:12 sebastian Exp $ */
> +/* $Id: apache_config.c,v 1.7.2.1.2.3 2007/08/03 01:14:23 stas Exp $ */
>
> #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
>
> @@ -51,6 +51,7 @@
> char *value;
> size_t value_len;
> char status;
> +char htaccess;
Sorry for bickering, but how about WS here?
> } php_dir_entry;
>
> static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const
> char *name, const char *value, int status)
> @@ -67,7 +68,8 @@
> e.value = apr_pstrdup(cmd->pool, value);
> e.value_len = strlen(value);
> e.status = status;
> -
> + e.htaccess = ((cmd->override & (RSRC_CONF|ACCESS_CONF)) == 0);
> +
> zend_hash_update(&d->config, (char *) name, strlen(name) + 1, &e,
> sizeof(e), NULL);
> return NULL;
> }
> @@ -170,7 +172,7 @@
> zend_hash_move_forward(&d->config)) {
> zend_hash_get_current_data(&d->config, (void **) &data);
> phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
> - if (zend_alter_ini_entry(str, str_len, data->value,
> data->value_len, data->status, PHP_INI_STAGE_ACTIVATE) == FAILURE) {
> + if (zend_alter_ini_entry(str, str_len, data->value,
> data->value_len, data->status,
> data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) {
> phpapdebug((stderr, "..FAILED\n"));
> }
> }
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
janiFri Aug 3 10:46:19 2007 UTC Modified files: /php-srcacinclude.m4 Log: MFB http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.382&r2=1.383&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.382 php-src/acinclude.m4:1.383 --- php-src/acinclude.m4:1.382 Thu Jul 26 22:45:22 2007 +++ php-src/acinclude.m4Fri Aug 3 10:46:19 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.382 2007/07/26 22:45:22 jani Exp $ +dnl $Id: acinclude.m4,v 1.383 2007/08/03 10:46:19 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2708,7 +2708,7 @@ esac fi is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` -if eval test -z "\$$is_arg_set"; then +if eval test "x\$$is_arg_set" = "x"; then PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS [$]arg" fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / acinclude.m4
janiFri Aug 3 10:45:23 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcacinclude.m4 Log: - Hopefully this fixes the "test: argument expected" error on solaris.. http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.24&r2=1.332.2.14.2.25&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.24 php-src/acinclude.m4:1.332.2.14.2.25 --- php-src/acinclude.m4:1.332.2.14.2.24Thu Jul 26 22:45:59 2007 +++ php-src/acinclude.m4Fri Aug 3 10:45:23 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.24 2007/07/26 22:45:59 jani Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.25 2007/08/03 10:45:23 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2708,7 +2708,7 @@ esac fi is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` -if eval test -z "\$$is_arg_set"; then +if eval test "x\$$is_arg_set" = "x"; then PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS [$]arg" fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main spprintf.c
tony2001Fri Aug 3 09:51:12 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main spprintf.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.8&r2=1.25.2.2.2.9&diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.25.2.2.2.8
php-src/main/spprintf.c:1.25.2.2.2.9
--- php-src/main/spprintf.c:1.25.2.2.2.8Fri Aug 3 09:48:58 2007
+++ php-src/main/spprintf.c Fri Aug 3 09:51:12 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.25.2.2.2.8 2007/08/03 09:48:58 tony2001 Exp $ */
+/* $Id: spprintf.c,v 1.25.2.2.2.9 2007/08/03 09:51:12 tony2001 Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -112,6 +112,8 @@
#include "ext/standard/php_smart_str.h"
+/* {{{ macros */
+
/*
* NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
*
@@ -176,12 +178,12 @@
}
\
} while (0)
-
+/* }}} */
/*
* Do format conversion placing the output in buffer
*/
-static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list ap)
+static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list
ap) /* {{{ */
{
register char *s = NULL;
char *q;
@@ -745,12 +747,12 @@
}
return;
}
-
+/* }}} */
/*
* This is the general purpose conversion function.
*/
-PHPAPI int vspprintf(char **pbuf, size_t max_len, const char *format, va_list
ap)
+PHPAPI int vspprintf(char **pbuf, size_t max_len, const char *format, va_list
ap) /* {{{ */
{
smart_str xbuf = {0};
@@ -765,9 +767,9 @@
return xbuf.len;
}
+/* }}} */
-
-PHPAPI int spprintf(char **pbuf, size_t max_len, const char *format, ...)
+PHPAPI int spprintf(char **pbuf, size_t max_len, const char *format, ...) /*
{{{ */
{
int cc;
va_list ap;
@@ -777,6 +779,8 @@
va_end(ap);
return (cc);
}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main spprintf.c
tony2001Fri Aug 3 09:51:05 2007 UTC
Modified files:
/php-src/main spprintf.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.47&r2=1.48&diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.47 php-src/main/spprintf.c:1.48
--- php-src/main/spprintf.c:1.47Fri Aug 3 09:46:50 2007
+++ php-src/main/spprintf.c Fri Aug 3 09:51:05 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.47 2007/08/03 09:46:50 tony2001 Exp $ */
+/* $Id: spprintf.c,v 1.48 2007/08/03 09:51:05 tony2001 Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -113,6 +113,8 @@
#include "ext/standard/php_smart_str.h"
+/* {{{ macros */
+
/*
* NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
*
@@ -205,12 +207,12 @@
}
\
} while (0)
-
+/* }}} */
/*
* Do format conversion placing the output in buffer
*/
-static void xbuf_format_converter(int unicode, smart_str *xbuf, const char
*fmt, va_list ap)
+static void xbuf_format_converter(int unicode, smart_str *xbuf, const char
*fmt, va_list ap) /* {{{ */
{
register char *s = NULL;
register UChar *u = NULL;
@@ -837,12 +839,12 @@
}
return;
}
-
+/* }}} */
/*
* This is the general purpose conversion function.
*/
-PHPAPI int vspprintf(char **pbuf, size_t max_len, const char *format, va_list
ap)
+PHPAPI int vspprintf(char **pbuf, size_t max_len, const char *format, va_list
ap) /* {{{ */
{
smart_str xbuf = {0};
@@ -857,9 +859,9 @@
return xbuf.len;
}
+/* }}} */
-
-PHPAPI int spprintf(char **pbuf, size_t max_len, const char *format, ...)
+PHPAPI int spprintf(char **pbuf, size_t max_len, const char *format, ...) /*
{{{ */
{
int cc;
va_list ap;
@@ -869,8 +871,9 @@
va_end(ap);
return (cc);
}
+/* }}} */
-PHPAPI int vuspprintf(UChar **pbuf, size_t max_len, const char *format,
va_list ap)
+PHPAPI int vuspprintf(UChar **pbuf, size_t max_len, const char *format,
va_list ap) /* {{{ */
{
smart_str xbuf = {0};
@@ -885,8 +888,9 @@
return xbuf.len / sizeof(UChar);
}
+/* }}} */
-PHPAPI int uspprintf(UChar **pbuf, size_t max_len, const char *format, ...)
+PHPAPI int uspprintf(UChar **pbuf, size_t max_len, const char *format, ...) /*
{{{ */
{
int cc;
va_list ap;
@@ -896,8 +900,9 @@
va_end(ap);
return (cc);
}
+/* }}} */
-PHPAPI int vzspprintf(zend_uchar type, zstr *pbuf, size_t max_len, const char
*format, va_list ap)
+PHPAPI int vzspprintf(zend_uchar type, zstr *pbuf, size_t max_len, const char
*format, va_list ap) /* {{{ */
{
if (type == IS_UNICODE) {
return vuspprintf(&pbuf->u, max_len, format, ap);
@@ -905,8 +910,9 @@
return vspprintf(&pbuf->s, max_len, format, ap);
}
}
+/* }}} */
-PHPAPI int zspprintf( zend_uchar type, zstr *pbuf, size_t max_len, const char
*format, ...)
+PHPAPI int zspprintf( zend_uchar type, zstr *pbuf, size_t max_len, const char
*format, ...) /* {{{ */
{
int cc;
va_list ap;
@@ -916,6 +922,7 @@
va_end(ap);
return (cc);
}
+/* }}} */
/*
* Local variables:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main spprintf.c
tony2001Fri Aug 3 09:48:58 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main spprintf.c
Log:
MFH: add I64 support to spprintf()
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.7&r2=1.25.2.2.2.8&diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.25.2.2.2.7
php-src/main/spprintf.c:1.25.2.2.2.8
--- php-src/main/spprintf.c:1.25.2.2.2.7Mon Jun 25 08:39:10 2007
+++ php-src/main/spprintf.c Fri Aug 3 09:48:58 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.25.2.2.2.7 2007/06/25 08:39:10 dmitry Exp $ */
+/* $Id: spprintf.c,v 1.25.2.2.2.8 2007/08/03 09:48:58 tony2001 Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -302,6 +302,16 @@
fmt++;
modifier = LM_LONG_DOUBLE;
break;
+ case 'I':
+ fmt++;
+#if SIZEOF_LONG_LONG
+ if (*fmt == '6' && *(fmt+1) == '4') {
+ fmt += 2;
+ modifier = LM_LONG_LONG;
+ } else
+#endif
+ modifier = LM_LONG;
+ break;
case 'l':
fmt++;
#if SIZEOF_LONG_LONG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main spprintf.c
tony2001Fri Aug 3 09:46:50 2007 UTC
Modified files:
/php-src/main spprintf.c
Log:
add I64 support to spprintf() (snprintf() already has it)
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.46&r2=1.47&diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.46 php-src/main/spprintf.c:1.47
--- php-src/main/spprintf.c:1.46Mon Jun 25 08:39:23 2007
+++ php-src/main/spprintf.c Fri Aug 3 09:46:50 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.46 2007/06/25 08:39:23 dmitry Exp $ */
+/* $Id: spprintf.c,v 1.47 2007/08/03 09:46:50 tony2001 Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -337,6 +337,16 @@
fmt++;
modifier = LM_LONG_DOUBLE;
break;
+ case 'I':
+ fmt++;
+#if SIZEOF_LONG_LONG
+ if (*fmt == '6' && *(fmt+1) == '4') {
+ fmt += 2;
+ modifier = LM_LONG_LONG;
+ } else
+#endif
+ modifier = LM_LONG;
+ break;
case 'l':
fmt++;
#if SIZEOF_LONG_LONG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2filter apache_config.c
janiFri Aug 3 09:33:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2filter apache_config.c
Log:
- Sync with apache2handler
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/apache_config.c?r1=1.34.2.1.2.2&r2=1.34.2.1.2.3&diff_format=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.34.2.1.2.2
php-src/sapi/apache2filter/apache_config.c:1.34.2.1.2.3
--- php-src/sapi/apache2filter/apache_config.c:1.34.2.1.2.2 Mon Jan 1
09:36:12 2007
+++ php-src/sapi/apache2filter/apache_config.c Fri Aug 3 09:33:30 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.34.2.1.2.2 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.34.2.1.2.3 2007/08/03 09:33:30 jani Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -35,7 +35,7 @@
#include "http_log.h"
#include "http_main.h"
#include "util_script.h"
-#include "http_core.h"
+#include "http_core.h"
#ifdef PHP_AP_DEBUG
#define phpapdebug(a) fprintf a
@@ -51,16 +51,15 @@
char *value;
size_t value_len;
char status;
+ char htaccess;
} php_dir_entry;
-static const char *real_value_hnd(cmd_parms *cmd, void *dummy,
- const char *name, const char *value, int status)
+static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const char
*name, const char *value, int status)
{
php_conf_rec *d = dummy;
php_dir_entry e;
- phpapdebug((stderr, "Getting %s=%s for %p (%d)\n", name, value, dummy,
- zend_hash_num_elements(&d->config)));
+ phpapdebug((stderr, "Getting %s=%s for %p (%d)\n", name, value, dummy,
zend_hash_num_elements(&d->config)));
if (!strncasecmp(value, "none", sizeof("none"))) {
value = "";
@@ -69,26 +68,23 @@
e.value = apr_pstrdup(cmd->pool, value);
e.value_len = strlen(value);
e.status = status;
-
- zend_hash_update(&d->config, (char *) name, strlen(name) + 1, &e,
- sizeof(e), NULL);
+ e.htaccess = ((cmd->override & (RSRC_CONF|ACCESS_CONF)) == 0);
+
+ zend_hash_update(&d->config, (char *) name, strlen(name) + 1, &e,
sizeof(e), NULL);
return NULL;
}
-static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy, const
char *name, const char *value)
{
return real_value_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
-static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy,
const char *name, const char *value)
{
return real_value_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
}
-static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char *arg1,
- const char *arg2, int status)
+static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char
*arg1, const char *arg2, int status)
{
char bool_val[2];
@@ -102,24 +98,20 @@
return real_value_hnd(cmd, dummy, arg1, bool_val, status);
}
-static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy, const
char *name, const char *value)
{
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
-static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy,
const char *name, const char *value)
{
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
}
-static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig,
- const char *arg)
+static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, const
char *arg)
{
if (apache2_php_ini_path_override) {
- return "Only first PHPINIDir directive honored per
configuration tree "
- "- subsequent ones ignored";
+ return "Only first PHPINIDir directive honored per
configuration tree - subsequent ones ignored";
}
apache2_php_ini_path_override = ap_server_root_relative(cmd->pool, arg);
return NULL;
@@ -180,8 +172,7 @@
zend_hash_move_forward(&d->config)) {
zend_hash_get_current_data(&d->config, (void **) &data);
phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
- if (zend_alter_ini_entry(str, str_len, data->value,
data->
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2handler apache_config.c
janiFri Aug 3 09:33:17 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/apache2handlerapache_config.c Log: ws http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.7.2.1.2.3&r2=1.7.2.1.2.4&diff_format=u Index: php-src/sapi/apache2handler/apache_config.c diff -u php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.3 php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.4 --- php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.3 Fri Aug 3 01:14:23 2007 +++ php-src/sapi/apache2handler/apache_config.c Fri Aug 3 09:33:17 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: apache_config.c,v 1.7.2.1.2.3 2007/08/03 01:14:23 stas Exp $ */ +/* $Id: apache_config.c,v 1.7.2.1.2.4 2007/08/03 09:33:17 jani Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -35,7 +35,7 @@ #include "http_log.h" #include "http_main.h" #include "util_script.h" -#include "http_core.h" +#include "http_core.h" #ifdef PHP_AP_DEBUG #define phpapdebug(a) fprintf a @@ -51,7 +51,7 @@ char *value; size_t value_len; char status; -char htaccess; + char htaccess; } php_dir_entry; static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const char *name, const char *value, int status) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c
janiFri Aug 3 09:38:43 2007 UTC
Modified files:
/php-src/sapi/apache2filter apache_config.c
/php-src/sapi/apache2handlerapache_config.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/apache_config.c?r1=1.38&r2=1.39&diff_format=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.38
php-src/sapi/apache2filter/apache_config.c:1.39
--- php-src/sapi/apache2filter/apache_config.c:1.38 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2filter/apache_config.c Fri Aug 3 09:38:43 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.38 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.39 2007/08/03 09:38:43 jani Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -35,7 +35,7 @@
#include "http_log.h"
#include "http_main.h"
#include "util_script.h"
-#include "http_core.h"
+#include "http_core.h"
#ifdef PHP_AP_DEBUG
#define phpapdebug(a) fprintf a
@@ -51,16 +51,15 @@
char *value;
size_t value_len;
char status;
+ char htaccess;
} php_dir_entry;
-static const char *real_value_hnd(cmd_parms *cmd, void *dummy,
- const char *name, const char *value, int status)
+static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const char
*name, const char *value, int status)
{
php_conf_rec *d = dummy;
php_dir_entry e;
- phpapdebug((stderr, "Getting %s=%s for %p (%d)\n", name, value, dummy,
- zend_hash_num_elements(&d->config)));
+ phpapdebug((stderr, "Getting %s=%s for %p (%d)\n", name, value, dummy,
zend_hash_num_elements(&d->config)));
if (!strncasecmp(value, "none", sizeof("none"))) {
value = "";
@@ -69,26 +68,23 @@
e.value = apr_pstrdup(cmd->pool, value);
e.value_len = strlen(value);
e.status = status;
-
- zend_hash_update(&d->config, (char *) name, strlen(name) + 1, &e,
- sizeof(e), NULL);
+ e.htaccess = ((cmd->override & (RSRC_CONF|ACCESS_CONF)) == 0);
+
+ zend_hash_update(&d->config, (char *) name, strlen(name) + 1, &e,
sizeof(e), NULL);
return NULL;
}
-static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy, const
char *name, const char *value)
{
return real_value_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
-static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy,
const char *name, const char *value)
{
return real_value_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
}
-static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char *arg1,
- const char *arg2, int status)
+static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char
*arg1, const char *arg2, int status)
{
char bool_val[2];
@@ -102,24 +98,20 @@
return real_value_hnd(cmd, dummy, arg1, bool_val, status);
}
-static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy, const
char *name, const char *value)
{
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
-static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy,
const char *name, const char *value)
{
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
}
-static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig,
- const char *arg)
+static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, const
char *arg)
{
if (apache2_php_ini_path_override) {
- return "Only first PHPINIDir directive honored per
configuration tree "
- "- subsequent ones ignored";
+ return "Only first PHPINIDir directive honored per
configuration tree - subsequent ones ignored";
}
apache2_php_ini_path_override = ap_server_root_relative(cmd->pool, arg);
return NULL;
@@ -149,7 +141,7 @@
if (pe->status >= data->status) continue;
}
zend_hash_update(&n->config, str.s, str_len, data,
sizeof(*data), NULL);
- phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n", str,
data->status, pe?pe->status:-1));
+ phpapdebug((stderr, "ADDING
