[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Apr 16 01:31:39 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3018r2=1.3019diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3018 php-src/ChangeLog:1.3019 --- php-src/ChangeLog:1.3018Tue Apr 15 01:31:35 2008 +++ php-src/ChangeLog Wed Apr 16 01:31:39 2008 @@ -1,3 +1,98 @@ +2008-04-15 Zoe Slattery [EMAIL PROTECTED] + +* (PHP_5_3) + scripts/dev/generate_phpt.php: + Changes to the code that generates variations (Robin Josie) + +2008-04-15 Felipe Pena [EMAIL PROTECTED] + +* ext/filter/tests/008.phpt + ext/standard/tests/strings/006.phpt: + - Fixed test + +* ext/standard/tests/strings/addcslashes_003.phpt + ext/standard/tests/strings/crc32_variation1.phpt: + - Fixed tests (NULL is allowed where binary string is expected) + +2008-04-15 Elizabeth Marie Smith [EMAIL PROTECTED] + +* sapi/apache/config.w32 + sapi/apache_hooks/config.w32: + MFB + +* (PHP_5_3) + sapi/apache/config.w32 + sapi/apache_hooks/config.w32: + These are really old config.w32 files - now they use PHP_PHP_BUILD + correctly instead of hard coding the path to the libraries + +2008-04-15 Gwynne Raskind [EMAIL PROTECTED] + +* (PHP_5_3) + configure.in: + MFH: force use of BSD sed for OS X hack (patch by Alexey Zakhlestin) + +* configure.in: + force use of BSD sed for OS X hack (patch by Alexey Zakhlestin) + +2008-04-15 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_execute.h + ZendEngine2/zend_execute.h: + Selected better initial VM stack size + +2008-04-15 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ext/standard/file.c: + MFB: Fixed bug #44034 (FILE_IGNORE_NEW_LINES in file() does not work as + expected when lines end in \r\n) + +2008-04-15 Antony Dovgal [EMAIL PROTECTED] + +* ext/ext_skel: + remove -ldl - it doesn't seem to be required on Linux and it's not present + on FreeBSD + +2008-04-15 Dmitry Stogov [EMAIL PROTECTED] + +* main/php_ini.c + main/php_ini.h + sapi/cgi/cgi_main.c: + Optimized request startup sequence for php.ini without per dir and per host + conf + igurations + +* (PHP_5_3) + main/php_ini.c + main/php_ini.h + sapi/cgi/cgi_main.c: + Optimized request startup sequence for php.ini without per dir and per host + configurations + +2008-04-15 Jani Taskinen [EMAIL PROTECTED] + +* ext/standard/basic_functions.c: + - missed one line + +* ext/standard/basic_functions.c + ext/standard/basic_functions.h: + - Readd config_get_has(). No need to document, it is only available for + debug builds. + +2008-04-15 Scott MacVicar [EMAIL PROTECTED] + +* (PHP_5_3) + ext/session/session.c: + Fixed bug #44720 (Prevent infinite recursion within session_register) + +* ext/session/session.c: + Fixed bug #44719 (More uninitialised values causing wierd errors) + +* ext/session/session.c: + Fixed bug #44722 (Segfault setting a null session path) + 2008-04-14 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_3)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Apr 16 01:31:42 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1283r2=1.1284diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1283 ZendEngine2/ChangeLog:1.1284 --- ZendEngine2/ChangeLog:1.1283Mon Apr 14 01:31:36 2008 +++ ZendEngine2/ChangeLog Wed Apr 16 01:31:42 2008 @@ -1,3 +1,9 @@ +2008-04-15 Dmitry Stogov [EMAIL PROTECTED] + +* zend_execute.h + zend_execute.h: + Selected better initial VM stack size + 2008-04-13 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_3) @@ -22631,7 +22637,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1283 2008/04/14 01:31:36 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1284 2008/04/16 01:31:42 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -24355,7 +24361,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1283 2008/04/14 01:31:36 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1284 2008/04/16 01:31:42 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/session session.c
On 15.04.2008 05:04, Scott MacVicar wrote: Can i backport this to 5.2? I believe all such fixes must be backported to 5_2. They are not going to do any harm anyway. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c basic_functions.h
janiTue Apr 15 08:43:48 2008 UTC
Modified files:
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
- Readd config_get_has(). No need to document, it is only available for debug
builds.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.894r2=1.895diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.894
php-src/ext/standard/basic_functions.c:1.895
--- php-src/ext/standard/basic_functions.c:1.894Mon Apr 14 15:42:13 2008
+++ php-src/ext/standard/basic_functions.c Tue Apr 15 08:43:48 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.894 2008/04/14 15:42:13 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.895 2008/04/15 08:43:48 jani Exp $ */
#include php.h
#include php_streams.h
@@ -956,6 +956,12 @@
ZEND_ARG_INFO(0, scanner_mode)
ZEND_END_ARG_INFO()
+#if ZEND_DEBUG
+static
+ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
+ZEND_END_ARG_INFO()
+#endif
+
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
ZEND_ARG_INFO(0, types)
@@ -6421,6 +6427,19 @@
}
/* }}} */
+#if ZEND_DEBUG
+/* This function returns an array of ALL valid ini options with values and
+ * is not the same as ini_get_all() which returns only registered ini
options. Only useful for devs to debug php.ini scanner/parser! */
+PHP_FUNCTION(config_get_hash) /* {{{ */
+{
+ HashTable *hash = php_ini_get_configuration_hash();
+
+ array_init(return_value);
+ zend_hash_apply_with_arguments(hash, (apply_func_args_t)
add_config_entry_cb, 1, return_value TSRMLS_CC);
+}
+/* }}} */
+#endif
+
static int copy_request_variable(void *pDest, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
{
zval *prefix, new_key;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.162r2=1.163diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.162
php-src/ext/standard/basic_functions.h:1.163
--- php-src/ext/standard/basic_functions.h:1.162Mon Apr 7 10:39:43 2008
+++ php-src/ext/standard/basic_functions.h Tue Apr 15 08:43:48 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.162 2008/04/07 10:39:43 colder Exp $ */
+/* $Id: basic_functions.h,v 1.163 2008/04/15 08:43:48 jani Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -127,7 +127,9 @@
/* From the INI parser */
PHP_FUNCTION(parse_ini_file);
+#if ZEND_DEBUG
PHP_FUNCTION(config_get_hash);
+#endif
PHP_FUNCTION(str_rot13);
PHP_FUNCTION(stream_get_filters);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c basic_functions.h
janiTue Apr 15 08:44:21 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.25r2=1.725.2.31.2.64.2.26diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.25
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.26
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.25 Mon Apr 14
15:32:42 2008
+++ php-src/ext/standard/basic_functions.c Tue Apr 15 08:44:21 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.25 2008/04/14 15:32:42 bjori Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.26 2008/04/15 08:44:21 jani Exp
$ */
#include php.h
#include php_streams.h
@@ -958,6 +958,12 @@
ZEND_ARG_INFO(0, scanner_mode)
ZEND_END_ARG_INFO()
+#if ZEND_DEBUG
+static
+ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
+ZEND_END_ARG_INFO()
+#endif
+
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
ZEND_ARG_INFO(0, types)
@@ -6320,6 +6326,19 @@
}
/* }}} */
+#if ZEND_DEBUG
+/* This function returns an array of ALL valid ini options with values and
+ * is not the same as ini_get_all() which returns only registered ini
options. Only useful for devs to debug php.ini scanner/parser! */
+PHP_FUNCTION(config_get_hash) /* {{{ */
+{
+ HashTable *hash = php_ini_get_configuration_hash();
+
+ array_init(return_value);
+ zend_hash_apply_with_arguments(hash, (apply_func_args_t)
add_config_entry_cb, 1, return_value TSRMLS_CC);
+}
+/* }}} */
+#endif
+
static int copy_request_variable(void *pDest, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
{
zval *prefix, new_key;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.139.2.4.2.6.2.8r2=1.139.2.4.2.6.2.9diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.139.2.4.2.6.2.8
php-src/ext/standard/basic_functions.h:1.139.2.4.2.6.2.9
--- php-src/ext/standard/basic_functions.h:1.139.2.4.2.6.2.8Mon Apr 14
15:32:42 2008
+++ php-src/ext/standard/basic_functions.h Tue Apr 15 08:44:21 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.139.2.4.2.6.2.8 2008/04/14 15:32:42 bjori Exp $
*/
+/* $Id: basic_functions.h,v 1.139.2.4.2.6.2.9 2008/04/15 08:44:21 jani Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -127,6 +127,9 @@
/* From the INI parser */
PHP_FUNCTION(parse_ini_file);
+#if ZEND_DEBUG
+PHP_FUNCTION(config_get_hash);
+#endif
PHP_FUNCTION(str_rot13);
PHP_FUNCTION(stream_get_filters);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c basic_functions.h
Looks like a good compromise. I'd argue the ini_get_all() addition is fine too.
It looks like you forgot the FE entry though..
-Hannes
On Tue, Apr 15, 2008 at 10:43 AM, Jani Taskinen [EMAIL PROTECTED] wrote:
janiTue Apr 15 08:43:48 2008 UTC
Modified files:
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
- Readd config_get_has(). No need to document, it is only available for
debug builds.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.894r2=1.895diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.894
php-src/ext/standard/basic_functions.c:1.895
--- php-src/ext/standard/basic_functions.c:1.894Mon Apr 14 15:42:13
2008
+++ php-src/ext/standard/basic_functions.c Tue Apr 15 08:43:48 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.894 2008/04/14 15:42:13 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.895 2008/04/15 08:43:48 jani Exp $ */
#include php.h
#include php_streams.h
@@ -956,6 +956,12 @@
ZEND_ARG_INFO(0, scanner_mode)
ZEND_END_ARG_INFO()
+#if ZEND_DEBUG
+static
+ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
+ZEND_END_ARG_INFO()
+#endif
+
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
ZEND_ARG_INFO(0, types)
@@ -6421,6 +6427,19 @@
}
/* }}} */
+#if ZEND_DEBUG
+/* This function returns an array of ALL valid ini options with values and
+ * is not the same as ini_get_all() which returns only registered ini
options. Only useful for devs to debug php.ini scanner/parser! */
+PHP_FUNCTION(config_get_hash) /* {{{ */
+{
+ HashTable *hash = php_ini_get_configuration_hash();
+
+ array_init(return_value);
+ zend_hash_apply_with_arguments(hash, (apply_func_args_t)
add_config_entry_cb, 1, return_value TSRMLS_CC);
+}
+/* }}} */
+#endif
+
static int copy_request_variable(void *pDest, int num_args, va_list args,
zend_hash_key *hash_key) /* {{{ */
{
zval *prefix, new_key;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.162r2=1.163diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.162
php-src/ext/standard/basic_functions.h:1.163
--- php-src/ext/standard/basic_functions.h:1.162Mon Apr 7 10:39:43
2008
+++ php-src/ext/standard/basic_functions.h Tue Apr 15 08:43:48 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.162 2008/04/07 10:39:43 colder Exp $ */
+/* $Id: basic_functions.h,v 1.163 2008/04/15 08:43:48 jani Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -127,7 +127,9 @@
/* From the INI parser */
PHP_FUNCTION(parse_ini_file);
+#if ZEND_DEBUG
PHP_FUNCTION(config_get_hash);
+#endif
PHP_FUNCTION(str_rot13);
PHP_FUNCTION(stream_get_filters);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
janiTue Apr 15 09:02:17 2008 UTC Modified files: /php-src/ext/standard basic_functions.c Log: - missed one line http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.895r2=1.896diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.895 php-src/ext/standard/basic_functions.c:1.896 --- php-src/ext/standard/basic_functions.c:1.895Tue Apr 15 08:43:48 2008 +++ php-src/ext/standard/basic_functions.c Tue Apr 15 09:02:16 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.895 2008/04/15 08:43:48 jani Exp $ */ +/* $Id: basic_functions.c,v 1.896 2008/04/15 09:02:16 jani Exp $ */ #include php.h #include php_streams.h @@ -3454,6 +3454,9 @@ PHP_FE(connection_status, arginfo_connection_status) PHP_FE(ignore_user_abort, arginfo_ignore_user_abort) PHP_FE(parse_ini_file, arginfo_parse_ini_file) +#if ZEND_DEBUG + PHP_FE(config_get_hash, arginfo_config_get_hash) +#endif PHP_FE(is_uploaded_file, arginfo_is_uploaded_file) PHP_FE(move_uploaded_file, arginfo_move_uploaded_file) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main php_ini.c php_ini.h /sapi/cgi cgi_main.c
dmitry Tue Apr 15 11:31:58 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main php_ini.c php_ini.h
/php-src/sapi/cgi cgi_main.c
Log:
Optimized request startup sequence for php.ini without per dir and per host
configurations
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.15.2.7r2=1.136.2.4.2.15.2.8diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.15.2.7
php-src/main/php_ini.c:1.136.2.4.2.15.2.8
--- php-src/main/php_ini.c:1.136.2.4.2.15.2.7 Sun Feb 3 14:35:59 2008
+++ php-src/main/php_ini.c Tue Apr 15 11:31:58 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.15.2.7 2008/02/03 14:35:59 helly Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.15.2.8 2008/04/15 11:31:58 dmitry Exp $ */
#include php.h
#include ext/standard/info.h
@@ -50,6 +50,8 @@
static int is_special_section = 0;
static HashTable *active_ini_hash;
static HashTable configuration_hash;
+static int has_per_dir_config = 0;
+static int has_per_host_config = 0;
PHPAPI char *php_ini_opened_path=NULL;
static php_extension_lists extension_lists;
PHPAPI char *php_ini_scanned_files=NULL;
@@ -264,6 +266,7 @@
key = key + sizeof(PATH) - 1;
key_len = Z_STRLEN_P(arg1) -
sizeof(PATH) + 1;
is_special_section = 1;
+ has_per_dir_config = 1;
/* HOST sections */
} else if (!strncasecmp(Z_STRVAL_P(arg1),
HOST, sizeof(HOST) - 1)) {
@@ -271,6 +274,8 @@
key = key + sizeof(HOST) - 1;
key_len = Z_STRLEN_P(arg1) -
sizeof(HOST) + 1;
is_special_section = 1;
+ has_per_host_config = 1;
+
} else {
is_special_section = 0;
}
@@ -737,6 +742,14 @@
}
/* }}} */
+/* {{{ php_ini_has_per_dir_config
+ */
+PHPAPI int php_ini_has_per_dir_config(void)
+{
+ return has_per_dir_config;
+}
+/* }}} */
+
/* {{{ php_ini_activate_per_dir_config
*/
PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len
TSRMLS_DC)
@@ -745,7 +758,7 @@
char *ptr;
/* Walk through each directory in path and apply any found
per-dir-system-configuration from configuration_hash */
- if (path path_len) {
+ if (has_per_dir_config path path_len) {
ptr = path + 1;
while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
*ptr = 0;
@@ -760,13 +773,21 @@
}
/* }}} */
+/* {{{ php_ini_has_per_host_config
+ */
+PHPAPI int php_ini_has_per_host_config(void)
+{
+ return has_per_host_config;
+}
+/* }}} */
+
/* {{{ php_ini_activate_per_host_config
*/
PHPAPI void php_ini_activate_per_host_config(char *host, uint host_len
TSRMLS_DC)
{
zval *tmp;
- if (host host_len) {
+ if (has_per_host_config host host_len) {
/* Search for source array matching the host from
configuration_hash */
if (zend_hash_find(configuration_hash, host, host_len, (void
**) tmp) == SUCCESS) {
php_ini_activate_config(Z_ARRVAL_P(tmp),
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.45.2.3.2.3.2.6r2=1.45.2.3.2.3.2.7diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.45.2.3.2.3.2.6
php-src/main/php_ini.h:1.45.2.3.2.3.2.7
--- php-src/main/php_ini.h:1.45.2.3.2.3.2.6 Sun Feb 3 14:48:38 2008
+++ php-src/main/php_ini.h Tue Apr 15 11:31:58 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.h,v 1.45.2.3.2.3.2.6 2008/02/03 14:48:38 helly Exp $ */
+/* $Id: php_ini.h,v 1.45.2.3.2.3.2.7 2008/04/15 11:31:58 dmitry Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -34,6 +34,8 @@
PHPAPI int cfg_get_string(char *varname, char **result);
PHPAPI int php_parse_user_ini_file(char *dirname, char *ini_filename,
HashTable *target_hash TSRMLS_DC);
PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type,
int stage TSRMLS_DC);
+PHPAPI int php_ini_has_per_dir_config(void);
+PHPAPI int php_ini_has_per_host_config(void);
PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len
TSRMLS_DC);
PHPAPI void php_ini_activate_per_host_config(char *host, uint host_len
TSRMLS_DC);
PHPAPI HashTable* php_ini_get_configuration_hash(void);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.17r2=1.267.2.15.2.50.2.18diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u
[PHP-CVS] cvs: php-src /main php_ini.c php_ini.h /sapi/cgi cgi_main.c
dmitry Tue Apr 15 11:32:13 2008 UTC
Modified files:
/php-src/main php_ini.c php_ini.h
/php-src/sapi/cgi cgi_main.c
Log:
Optimized request startup sequence for php.ini without per dir and per host
conf
igurations
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.165r2=1.166diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.165 php-src/main/php_ini.c:1.166
--- php-src/main/php_ini.c:1.165Sun Feb 3 14:35:29 2008
+++ php-src/main/php_ini.c Tue Apr 15 11:32:13 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.165 2008/02/03 14:35:29 helly Exp $ */
+/* $Id: php_ini.c,v 1.166 2008/04/15 11:32:13 dmitry Exp $ */
#include php.h
#include ext/standard/info.h
@@ -50,6 +50,8 @@
static int is_special_section = 0;
static HashTable *active_ini_hash;
static HashTable configuration_hash;
+static int has_per_dir_config = 0;
+static int has_per_host_config = 0;
PHPAPI char *php_ini_opened_path=NULL;
static php_extension_lists extension_lists;
PHPAPI char *php_ini_scanned_files=NULL;
@@ -264,6 +266,7 @@
key = key + sizeof(PATH) - 1;
key_len = Z_STRLEN_P(arg1) -
sizeof(PATH) + 1;
is_special_section = 1;
+ has_per_dir_config = 1;
/* HOST sections */
} else if (!strncasecmp(Z_STRVAL_P(arg1),
HOST, sizeof(HOST) - 1)) {
@@ -271,6 +274,8 @@
key = key + sizeof(HOST) - 1;
key_len = Z_STRLEN_P(arg1) -
sizeof(HOST) + 1;
is_special_section = 1;
+ has_per_host_config = 1;
+
} else {
is_special_section = 0;
}
@@ -733,6 +738,14 @@
}
/* }}} */
+/* {{{ php_ini_has_per_dir_config
+ */
+PHPAPI int php_ini_has_per_dir_config(void)
+{
+ return has_per_dir_config;
+}
+/* }}} */
+
/* {{{ php_ini_activate_per_dir_config
*/
PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len
TSRMLS_DC)
@@ -741,7 +754,7 @@
char *ptr;
/* Walk through each directory in path and apply any found
per-dir-system-configuration from configuration_hash */
- if (path path_len) {
+ if (has_per_dir_config path path_len) {
ptr = path + 1;
while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
*ptr = 0;
@@ -756,13 +769,21 @@
}
/* }}} */
+/* {{{ php_ini_has_per_host_config
+ */
+PHPAPI int php_ini_has_per_host_config(void)
+{
+ return has_per_host_config;
+}
+/* }}} */
+
/* {{{ php_ini_activate_per_host_config
*/
PHPAPI void php_ini_activate_per_host_config(char *host, uint host_len
TSRMLS_DC)
{
zval *tmp;
- if (host host_len) {
+ if (has_per_host_config host host_len) {
/* Search for source array matching the host from
configuration_hash */
if (zend_hash_find(configuration_hash, host, host_len, (void
**) tmp) == SUCCESS) {
php_ini_activate_config(Z_ARRVAL_P(tmp),
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.57r2=1.58diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.57 php-src/main/php_ini.h:1.58
--- php-src/main/php_ini.h:1.57 Sun Feb 3 14:48:22 2008
+++ php-src/main/php_ini.h Tue Apr 15 11:32:13 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.h,v 1.57 2008/02/03 14:48:22 helly Exp $ */
+/* $Id: php_ini.h,v 1.58 2008/04/15 11:32:13 dmitry Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -34,6 +34,8 @@
PHPAPI int cfg_get_string(char *varname, char **result);
PHPAPI int php_parse_user_ini_file(char *dirname, char *ini_filename,
HashTable *target_hash TSRMLS_DC);
PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type,
int stage TSRMLS_DC);
+PHPAPI int php_ini_has_per_dir_config(void);
+PHPAPI int php_ini_has_per_host_config(void);
PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len
TSRMLS_DC);
PHPAPI void php_ini_activate_per_host_config(char *host, uint host_len
TSRMLS_DC);
PHPAPI HashTable* php_ini_get_configuration_hash(void);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.354r2=1.355diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.354 php-src/sapi/cgi/cgi_main.c:1.355
--- php-src/sapi/cgi/cgi_main.c:1.354 Wed Apr 9 09:17:01 2008
+++ php-src/sapi/cgi/cgi_main.c Tue Apr 15 11:32:13 2008
@@ -21,7 +21,7 @@
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Apr 15 12:13:47 2008 UTC Modified files: /CVSROOTavail Log: - Raphael karma for testfest-web http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1377r2=1.1378diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1377 CVSROOT/avail:1.1378 --- CVSROOT/avail:1.1377Mon Mar 31 14:40:46 2008 +++ CVSROOT/avail Tue Apr 15 12:13:47 2008 @@ -29,7 +29,7 @@ avail|edink,jmertic|win-installer # Testfest web -avail|davidc,lsmith|php-testfest-web +avail|davidc,lsmith,goldoraf|php-testfest-web # The PhD (DocBook build system) lead developers avail|bjori,gwynne|phd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext ext_skel
tony2001Tue Apr 15 12:47:18 2008 UTC
Modified files:
/php-src/extext_skel
Log:
remove -ldl - it doesn't seem to be required on Linux and it's not present on
FreeBSD
http://cvs.php.net/viewvc.cgi/php-src/ext/ext_skel?r1=1.49r2=1.50diff_format=u
Index: php-src/ext/ext_skel
diff -u php-src/ext/ext_skel:1.49 php-src/ext/ext_skel:1.50
--- php-src/ext/ext_skel:1.49 Sun May 16 12:10:35 2004
+++ php-src/ext/ext_skelTue Apr 15 12:47:18 2008
@@ -161,7 +161,7 @@
dnl ],[
dnl AC_MSG_ERROR([wrong $extname lib version or lib not found])
dnl ],[
- dnl -L\$${EXTNAME}_DIR/lib -lm -ldl
+ dnl -L\$${EXTNAME}_DIR/lib -lm
dnl ])
dnl
dnl PHP_SUBST(${EXTNAME}_SHARED_LIBADD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext ext_skel
tony2001Tue Apr 15 12:47:33 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/extext_skel
Log:
MFH: remove -ldl
http://cvs.php.net/viewvc.cgi/php-src/ext/ext_skel?r1=1.49r2=1.49.8.1diff_format=u
Index: php-src/ext/ext_skel
diff -u php-src/ext/ext_skel:1.49 php-src/ext/ext_skel:1.49.8.1
--- php-src/ext/ext_skel:1.49 Sun May 16 12:10:35 2004
+++ php-src/ext/ext_skelTue Apr 15 12:47:33 2008
@@ -161,7 +161,7 @@
dnl ],[
dnl AC_MSG_ERROR([wrong $extname lib version or lib not found])
dnl ],[
- dnl -L\$${EXTNAME}_DIR/lib -lm -ldl
+ dnl -L\$${EXTNAME}_DIR/lib -lm
dnl ])
dnl
dnl PHP_SUBST(${EXTNAME}_SHARED_LIBADD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings 006.phpt
felipe Tue Apr 15 15:41:41 2008 UTC Modified files: /php-src/ext/standard/tests/strings 006.phpt Log: - Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/006.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/006.phpt diff -u php-src/ext/standard/tests/strings/006.phpt:1.2 php-src/ext/standard/tests/strings/006.phpt:1.3 --- php-src/ext/standard/tests/strings/006.phpt:1.2 Wed Mar 26 14:46:17 2008 +++ php-src/ext/standard/tests/strings/006.phpt Tue Apr 15 15:41:41 2008 @@ -13,9 +13,9 @@ echo Done\n; ? --EXPECTF-- -Warning: highlight_file(! A in %s on line %d +Warning: highlight_file(! ): failed to open stream: File name too long in %s006.php on line %d -Warning: highlight_file(): Failed opening 'A! A in %s on line %d +Warning: highlight_file(): Failed opening 'A! AAA' for highlighting in %s006.php on line %d bool(false) bool(false)
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard file.c
iliaa Tue Apr 15 15:48:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard file.c
/php-srcNEWS
Log:
MFB: Fixed bug #44034 (FILE_IGNORE_NEW_LINES in file() does not work as
expected when lines end in \r\n)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.11r2=1.409.2.6.2.28.2.12diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.11
php-src/ext/standard/file.c:1.409.2.6.2.28.2.12
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.11 Sun Mar 30 15:05:48 2008
+++ php-src/ext/standard/file.c Tue Apr 15 15:48:20 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.11 2008/03/30 15:05:48 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.12 2008/04/15 15:48:20 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -775,16 +775,20 @@
} while ((p = memchr(p, eol_marker, (e-p;
} else {
do {
- if (skip_blank_lines !(p-s)) {
+ int windows_eol = 0;
+ if (eol_marker == '\n' *(p - 1) == '\r') {
+ windows_eol++;
+ }
+ if (skip_blank_lines !(p-s-windows_eol)) {
s = ++p;
continue;
}
if (PG(magic_quotes_runtime)) {
/* s is in target_buf which is freed at
the end of the function */
- slashed = php_addslashes(s, (p-s),
len, 0 TSRMLS_CC);
+ slashed = php_addslashes(s,
(p-s-windows_eol), len, 0 TSRMLS_CC);
add_index_stringl(return_value, i++,
slashed, len, 0);
} else {
- add_index_stringl(return_value, i++,
estrndup(s, p-s), p-s, 0);
+ add_index_stringl(return_value, i++,
estrndup(s, p-s-windows_eol), p-s-windows_eol, 0);
}
s = ++p;
} while ((p = memchr(p, eol_marker, (e-p;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.158r2=1.2027.2.547.2.965.2.159diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.158
php-src/NEWS:1.2027.2.547.2.965.2.159
--- php-src/NEWS:1.2027.2.547.2.965.2.158 Mon Apr 14 08:15:11 2008
+++ php-src/NEWSTue Apr 15 15:48:20 2008
@@ -158,6 +158,8 @@
(Derick, iuri dot fiedoruk at hp dot com).
- Fixed bug #44214 (Crash using preg_replace_callback() and global variable).
(Nuno, Scott)
+- Fixed bug #44034 (FILE_IGNORE_NEW_LINES in file() does not work as expected
+ when lines end in \r\n). (Ilia)
- Fixed bug #43960 (strtotime() returns timestamp in the future when given a
bogus string). (Derick)
- Fixed bug #43832 (mysqli_get_charset() doesn't expose charset comment).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
gwynne Tue Apr 15 16:31:15 2008 UTC Modified files: /php-srcconfigure.in Log: force use of BSD sed for OS X hack (patch by Alexey Zakhlestin) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.652r2=1.653diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.652 php-src/configure.in:1.653 --- php-src/configure.in:1.652 Tue Apr 1 02:41:16 2008 +++ php-src/configure.inTue Apr 15 16:31:15 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.652 2008/04/01 02:41:16 gwynne Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.653 2008/04/15 16:31:15 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -212,7 +212,7 @@ if test $GCC = yes; then case $host_alias in *darwin*) -GCC_MAJOR_VERSION=`$CC -dumpversion | $SED -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` +GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` ;; *) GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in
gwynne Tue Apr 15 16:31:36 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: MFH: force use of BSD sed for OS X hack (patch by Alexey Zakhlestin) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.14r2=1.579.2.52.2.77.2.15diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.14 php-src/configure.in:1.579.2.52.2.77.2.15 --- php-src/configure.in:1.579.2.52.2.77.2.14 Tue Apr 1 02:37:02 2008 +++ php-src/configure.inTue Apr 15 16:31:36 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.14 2008/04/01 02:37:02 gwynne Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.15 2008/04/15 16:31:36 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -211,7 +211,7 @@ if test $GCC = yes; then case $host_alias in *darwin*) -GCC_MAJOR_VERSION=`$CC -dumpversion | $SED -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` +GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` ;; *) GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache config.w32 /sapi/apache_hooks config.w32
auroraeosrose Tue Apr 15 16:55:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apacheconfig.w32
/php-src/sapi/apache_hooks config.w32
Log:
These are really old config.w32 files - now they use PHP_PHP_BUILD correctly
instead of hard coding the path to the libraries
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/config.w32?r1=1.7r2=1.7.8.1diff_format=u
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.7
php-src/sapi/apache/config.w32:1.7.8.1
--- php-src/sapi/apache/config.w32:1.7 Sat Jan 17 13:00:04 2004
+++ php-src/sapi/apache/config.w32 Tue Apr 15 16:55:53 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.7 2004/01/17 13:00:04 sniper Exp $
+// $Id: config.w32,v 1.7.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
@@ -9,10 +9,10 @@
if (PHP_APACHE != no) {
if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE,
php_usual_include_suspects +
; + PROGRAM_FILES + \\Apache
Group\\Apache\\include +
- ;..\\php_build\\apache\\src\\include)
+ ; + PHP_PHP_BUILD + \\apache\\src\\include)
CHECK_LIB(ApacheCore.lib, apache,
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ; + PHP_PHP_BUILD + \\apache\\src\\corer)) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/config.w32?r1=1.2r2=1.2.8.1diff_format=u
Index: php-src/sapi/apache_hooks/config.w32
diff -u php-src/sapi/apache_hooks/config.w32:1.2
php-src/sapi/apache_hooks/config.w32:1.2.8.1
--- php-src/sapi/apache_hooks/config.w32:1.2Sat Jan 17 13:00:08 2004
+++ php-src/sapi/apache_hooks/config.w32Tue Apr 15 16:55:53 2008
@@ -1,15 +1,15 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2004/01/17 13:00:08 sniper Exp $
+// $Id: config.w32,v 1.2.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
ARG_WITH('apache-hooks', 'Build Apache 1.3.x (hooks) version of PHP', 'no');
if (PHP_APACHE_HOOKS != no) {
if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE_HOOKS,
php_usual_include_suspects +
; + PROGRAM_FILES + \\Apache
Group\\Apache\\include +
- ;..\\php_build\\apache\\src\\include)
+ ; + PHP_PHP_BUILD + \\apache\\src\\include)
CHECK_LIB(ApacheCore.lib, apache_hooks,
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ; + PHP_PHP_BUILD + \\apache\\src\\corer)) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache config.w32 /sapi/apache_hooks config.w32
auroraeosrose Tue Apr 15 16:59:40 2008 UTC
Modified files:
/php-src/sapi/apacheconfig.w32
/php-src/sapi/apache_hooks config.w32
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/config.w32?r1=1.8r2=1.9diff_format=u
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.8 php-src/sapi/apache/config.w32:1.9
--- php-src/sapi/apache/config.w32:1.8 Mon Jul 16 19:02:43 2007
+++ php-src/sapi/apache/config.w32 Tue Apr 15 16:59:40 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.8 2007/07/16 19:02:43 tony2001 Exp $
+// $Id: config.w32,v 1.9 2008/04/15 16:59:40 auroraeosrose Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
@@ -9,10 +9,10 @@
if (PHP_APACHE != no) {
if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE,
php_usual_include_suspects +
; + PROGRAM_FILES + \\Apache
Group\\Apache\\include +
- ;..\\php_build\\apache\\src\\include)
+ ; + PHP_PHP_BUILD + \\apache\\src\\include)
CHECK_LIB(ApacheCore.lib, apache,
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ; + PHP_PHP_BUILD + \\apache\\src\\corer)) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache', 'mod_php.c sapi_apache.c php_apache.c',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/config.w32?r1=1.2r2=1.3diff_format=u
Index: php-src/sapi/apache_hooks/config.w32
diff -u php-src/sapi/apache_hooks/config.w32:1.2
php-src/sapi/apache_hooks/config.w32:1.3
--- php-src/sapi/apache_hooks/config.w32:1.2Sat Jan 17 13:00:08 2004
+++ php-src/sapi/apache_hooks/config.w32Tue Apr 15 16:59:40 2008
@@ -1,15 +1,15 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2004/01/17 13:00:08 sniper Exp $
+// $Id: config.w32,v 1.3 2008/04/15 16:59:40 auroraeosrose Exp $
ARG_WITH('apache-hooks', 'Build Apache 1.3.x (hooks) version of PHP', 'no');
if (PHP_APACHE_HOOKS != no) {
if (CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE_HOOKS,
php_usual_include_suspects +
; + PROGRAM_FILES + \\Apache
Group\\Apache\\include +
- ;..\\php_build\\apache\\src\\include)
+ ; + PHP_PHP_BUILD + \\apache\\src\\include)
CHECK_LIB(ApacheCore.lib, apache_hooks,
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ; + PHP_PHP_BUILD + \\apache\\src\\corer)) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings addcslashes_003.phpt crc32_variation1.phpt
felipe Tue Apr 15 17:13:09 2008 UTC Modified files: /php-src/ext/standard/tests/strings addcslashes_003.phpt crc32_variation1.phpt Log: - Fixed tests (NULL is allowed where binary string is expected) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addcslashes_003.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/addcslashes_003.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/crc32_variation1.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/strings/crc32_variation1.phpt diff -u php-src/ext/standard/tests/strings/crc32_variation1.phpt:1.3 php-src/ext/standard/tests/strings/crc32_variation1.phpt:1.4 --- php-src/ext/standard/tests/strings/crc32_variation1.phpt:1.3Fri Nov 9 07:29:18 2007 +++ php-src/ext/standard/tests/strings/crc32_variation1.phptTue Apr 15 17:13:08 2008 @@ -158,14 +158,10 @@ NULL -- Iteration 15 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 16 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 17 -- int(-2082672713) @@ -189,14 +185,10 @@ int(-1465013268) -- Iteration 24 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 25 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 26 -- @@ -263,14 +255,10 @@ NULL -- Iteration 15 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 16 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 17 -- int(-2082672713) @@ -298,14 +286,10 @@ int(-1465013268) -- Iteration 24 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 25 -- - -Warning: crc32() expects parameter 1 to be strictly a binary string, null given in %s on line %d -NULL +int(0) -- Iteration 26 -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter/tests 008.phpt
felipe Tue Apr 15 18:59:27 2008 UTC
Modified files:
/php-src/ext/filter/tests 008.phpt
Log:
- Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/008.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/filter/tests/008.phpt
diff -u php-src/ext/filter/tests/008.phpt:1.7
php-src/ext/filter/tests/008.phpt:1.8
--- php-src/ext/filter/tests/008.phpt:1.7 Tue Dec 19 14:16:07 2006
+++ php-src/ext/filter/tests/008.phpt Tue Apr 15 18:59:27 2008
@@ -10,7 +10,7 @@
echo Done\n;
?
---EXPECTF--
+--EXPECTF--
array(18) {
[0]=
string(3) int
@@ -50,6 +50,6 @@
string(8) callback
}
-Warning: Wrong parameter count for filter_list() in %s on line %d
+Warning: filter_list() expects exactly 0 parameters, 1 given in %s on line %d
NULL
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /scripts/dev generate_phpt.php
zoe Tue Apr 15 19:50:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/scripts/devgenerate_phpt.php
Log:
Changes to the code that generates variations (Robin Josie)
http://cvs.php.net/viewvc.cgi/php-src/scripts/dev/generate_phpt.php?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/scripts/dev/generate_phpt.php
diff -u php-src/scripts/dev/generate_phpt.php:1.1.2.4
php-src/scripts/dev/generate_phpt.php:1.1.2.5
--- php-src/scripts/dev/generate_phpt.php:1.1.2.4 Sun Apr 13 10:46:12 2008
+++ php-src/scripts/dev/generate_phpt.php Tue Apr 15 19:50:13 2008
@@ -323,70 +323,72 @@
// integer values
$variation_array['int'] = array(
- 0,
- 1,
- 12345,
- -2345
+ 'int 0' = 0,
+ 'int 1' = 1,
+ 'int 12345' = 12345,
+ 'int -12345' = -2345
);
// float values
$variation_array['float'] = array(
- 10.5,
- -10.5,
- 10.1234567e10,
- 10.7654321E-10,
- .5
+ 'float 10.5' = 10.5,
+ 'float -10.5' = -10.5,
+ 'float 12.3456789000e10' = 12.3456789000e10,
+ 'float -12.3456789000e10' = -12.3456789000e10,
+ 'float .5' = .5
);
// array values
$variation_array['array'] = array(
- array(),
- array(0),
- array(1),
- array(1, 2),
- array('color' = 'red', 'item' = 'pen')
+ 'empty array' = array(),
+ 'int indexed array' = \$index_array,
+ 'associative array' = \$assoc_array,
+ 'nested arrays' = array('foo', \$index_array, \$assoc_array),
);
// null vlaues
$variation_array['null'] = array(
- NULL,
- null
+ 'uppercase NULL' = NULL,
+ 'lowercase null' = null
);
// boolean values
$variation_array['boolean'] = array(
- true,
- false,
- TRUE,
- FALSE
+ 'lowercase true' = true,
+ 'lowercase false' =false,
+ 'uppercase TRUE' =TRUE,
+ 'uppercase FALSE' =FALSE
);
- // empty string
+ // empty data
$variation_array['empty'] = array(
- \\,
- '',
+ 'empty string DQ' = \\,
+ 'empty string SQ' = ''
);
// string values
$variation_array['string'] = array(
- \string\,
- 'string',
+ 'string DQ' = \string\,
+ 'string SQ' = 'string',
+ 'mixed case string' = \sTrInG\,
+ 'heredoc' = \$heredoc
);
- // objects
+ // object data
$variation_array['object'] = array(
- new stdclass()
+ 'instance of classWithToString' = new classWithToString(),
+ 'instance of classWithoutToString' = new
classWithoutToString()
);
// undefined variable
$variation_array['undefined'] = array(
- '$undefined_var'
+ 'undefined var' = @\$undefined_var
);
// unset variable
$variation_array['unset'] = array(
- '$unset_var'
+ 'unset var' = @\$unset_var
);
@@ -611,6 +613,9 @@
// decrement the $which_arg so that its matches with the index of
$types
$which_arg--;
+
+ //generate code to define error handler
+ $code_block = add_error_handler($code_block);
// generate code to initialise arguments that won't be substituted
array_push($code_block, // Initialise function arguments not being
substituted (if any));
@@ -621,16 +626,34 @@
}
}
array_push($code_block, $blank_line);
+
// generate code to unset a variable
array_push($code_block, //get an unset variable);
array_push($code_block, \$unset_var = 10;);
array_push($code_block, unset (\$unset_var););
array_push($code_block, $blank_line);
+
+ //define some classes
+ $code_block = define_classes($code_block);
+
+ //add heredoc string
+ array_push($code_block, // heredoc string);
+ array_push($code_block, \$heredoc = EOT);
+ array_push($code_block, hello world);
+ array_push($code_block, EOT;);
+ array_push($code_block, $blank_line);
+
+ //add arrays
+ array_push($code_block, // add arrays);
+ array_push($code_block, \$index_array = array (1, 2, 3););
+ array_push($code_block, \$assoc_array = array ('one' = 1, 'two' =
2););
+
