Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c php_reflection.h
You propably should not add this if you think this extension
can't be compiled as shared:
+#ifdef COMPILE_DL_REFLECTION
+ZEND_GET_MODULE(reflection)
+#endif
On Thu, 17 Nov 2005, Marcus Boerger wrote:
helly Thu Nov 17 17:59:41 2005 EDT
Modified files:
/php-src/ext/reflection php_reflection.c php_reflection.h
Log:
- Move Reflection into its own extension
http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1=1.189&r2=1.190&ty=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.189
php-src/ext/reflection/php_reflection.c:1.190
--- php-src/ext/reflection/php_reflection.c:1.189 Tue Nov 15 10:20:19 2005
+++ php-src/ext/reflection/php_reflection.c Thu Nov 17 17:59:38 2005
@@ -19,7 +19,17 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.189 2005/11/15 15:20:19 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.190 2005/11/17 22:59:38 helly Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_ini.h"
+#include "php_reflection.h"
+#include "ext/standard/info.h"
+
#include "zend.h"
#include "zend_API.h"
#include "zend_exceptions.h"
@@ -29,16 +39,34 @@
#include "zend_interfaces.h"
/* Class entry pointers */
-ZEND_API zend_class_entry *reflector_ptr;
-ZEND_API zend_class_entry *reflection_exception_ptr;
-ZEND_API zend_class_entry *reflection_ptr;
-ZEND_API zend_class_entry *reflection_function_ptr;
-ZEND_API zend_class_entry *reflection_parameter_ptr;
-ZEND_API zend_class_entry *reflection_class_ptr;
-ZEND_API zend_class_entry *reflection_object_ptr;
-ZEND_API zend_class_entry *reflection_method_ptr;
-ZEND_API zend_class_entry *reflection_property_ptr;
-ZEND_API zend_class_entry *reflection_extension_ptr;
+PHPAPI zend_class_entry *reflector_ptr;
+PHPAPI zend_class_entry *reflection_exception_ptr;
+PHPAPI zend_class_entry *reflection_ptr;
+PHPAPI zend_class_entry *reflection_function_ptr;
+PHPAPI zend_class_entry *reflection_parameter_ptr;
+PHPAPI zend_class_entry *reflection_class_ptr;
+PHPAPI zend_class_entry *reflection_object_ptr;
+PHPAPI zend_class_entry *reflection_method_ptr;
+PHPAPI zend_class_entry *reflection_property_ptr;
+PHPAPI zend_class_entry *reflection_extension_ptr;
+
+ZEND_BEGIN_MODULE_GLOBALS(reflection)
+ZEND_END_MODULE_GLOBALS(reflection)
+
+#ifdef ZTS
+# define REFLECTION_G(v) \
+ TSRMG(reflection_globals_id, zend_reflection_globals*, v)
+extern int reflection_globals_id;
+#else
+# define REFLECTION_G(v) (reflection_globals.v)
+extern zend_reflection_globals reflectionglobals;
+#endif
+
+#ifdef COMPILE_DL_REFLECTION
+ZEND_GET_MODULE(reflection)
+#endif
+
+ZEND_DECLARE_MODULE_GLOBALS(reflection)
/* Method macros */
@@ -921,7 +949,7 @@
/* }}} */
/* {{{ zend_reflection_class_factory */
-ZEND_API void zend_reflection_class_factory(zend_class_entry *ce, zval *object
TSRMLS_DC)
+PHPAPI void zend_reflection_class_factory(zend_class_entry *ce, zval *object
TSRMLS_DC)
{
reflection_object *intern;
zval *name;
@@ -4132,6 +4160,10 @@
};
/* }}} */
+function_entry reflection_ext_functions[] = { /* {{{ */
+ {NULL, NULL, NULL}
+}; /* }}} */
+
static zend_object_handlers *zend_std_obj_handlers;
/* {{{ _reflection_write_property */
@@ -4152,10 +4184,17 @@
}
/* }}} */
-/* {{{ zend_register_reflection_api */
-ZEND_API void zend_register_reflection_api(TSRMLS_D) {
+static void reflection_init_globals(zend_reflection_globals *globals) /* {{{ */
+{
+ /* Initialize your global struct */
+} /* }}} */
+
+PHP_MINIT_FUNCTION(reflection) /* {{{ */
+{
zend_class_entry _reflection_entry;
+ ZEND_INIT_MODULE_GLOBALS(reflection, reflection_init_globals, NULL);
+
zend_std_obj_handlers = zend_get_std_object_handlers();
memcpy(&reflection_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
reflection_object_handlers.clone_obj = NULL;
@@ -4230,8 +4269,32 @@
REGISTER_MAIN_LONG_CONSTANT("C_IMPLICIT_ABSTRACT",
ZEND_ACC_IMPLICIT_ABSTRACT_CLASS, CONST_PERSISTENT|CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("C_EXPLICIT_ABSTRACT",
ZEND_ACC_EXPLICIT_ABSTRACT_CLASS, CONST_PERSISTENT|CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("C_FINAL", ZEND_ACC_FINAL_CLASS,
CONST_PERSISTENT|CONST_CS);
-}
-/* }}} */
+
+ return SUCCESS;
+} /* }}} */
+
+PHP_MINFO_FUNCTION(reflection) /* {{{ */
+{
+ php_info_print_table_start();
+ php_info_print_table_header(2, "Reflection", "enabled");
+
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.190
2005/11/17 22:59:38 helly Exp $");
+
+ php_info_print_table_end();
+} /* }}} */
+
+zend_module_entry reflection_module_entry = { /* {{{ */
+ STANDARD_MODULE_HEADER,
+ "Reflection",
+ reflection_ext_functions,
+ PHP_MINIT(reflection),
+ NULL,
+ NULL,
+ NULL,
+ PHP_MINFO(reflection),
+ "0.1"
[PHP-CVS] cvs: php-src /win32/build config.w32
rrichards Thu Nov 17 21:50:49 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
fix configure - reflection is its own extension
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.48&r2=1.49&ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.48 php-src/win32/build/config.w32:1.49
--- php-src/win32/build/config.w32:1.48 Thu Sep 22 09:18:14 2005
+++ php-src/win32/build/config.w32 Thu Nov 17 21:50:46 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.48 2005/09/22 13:18:14 edink Exp $
+// $Id: config.w32,v 1.49 2005/11/18 02:50:46 rrichards Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -261,7 +261,7 @@
zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \
zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c
\
- zend_mm.c zend_default_classes.c zend_reflection_api.c zend_execute.c
zend_strtod.c");
+ zend_mm.c zend_default_classes.c zend_execute.c zend_strtod.c");
ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c
\
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.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 credits_ext.h
helly Thu Nov 17 18:43:53 2005 EDT
Modified files:
/php-src/ext/standard credits_ext.h
Log:
- Reflection was moved to its own extension
http://cvs.php.net/diff.php/php-src/ext/standard/credits_ext.h?r1=1.31&r2=1.32&ty=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.31
php-src/ext/standard/credits_ext.h:1.32
--- php-src/ext/standard/credits_ext.h:1.31 Wed Aug 31 11:01:13 2005
+++ php-src/ext/standard/credits_ext.h Thu Nov 17 18:43:53 2005
@@ -66,6 +66,7 @@
CREDIT_LINE("Pspell", "Vlad Krupin");
CREDIT_LINE("Readline", "Thies C. Arntzen");
CREDIT_LINE("Recode", "Kristian Köhntopp");
+CREDIT_LINE("Reflection", "Marcus Boerger, Timm Friebe, George Schlossnagle,
Andrei Zmievski");
CREDIT_LINE("Sessions", "Sascha Schumann, Andrei Zmievski");
CREDIT_LINE("Shared Memory Operations", "Slava Poliakov, Ilia Alshanetsky");
CREDIT_LINE("SimpleXML", "Sterling Hughes, Marcus Boerger, Rob Richards");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection config.m4
helly Thu Nov 17 18:21:15 2005 EDT Modified files: /php-src/ext/reflection config.m4 Log: - Need to define HAVE_REFLECTION http://cvs.php.net/diff.php/php-src/ext/reflection/config.m4?r1=1.2&r2=1.3&ty=u Index: php-src/ext/reflection/config.m4 diff -u php-src/ext/reflection/config.m4:1.2 php-src/ext/reflection/config.m4:1.3 --- php-src/ext/reflection/config.m4:1.2Thu Nov 17 17:49:03 2005 +++ php-src/ext/reflection/config.m4Thu Nov 17 18:21:15 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 2005/11/17 22:49:03 helly Exp $ +dnl $Id: config.m4,v 1.3 2005/11/17 23:21:15 helly Exp $ dnl config.m4 for extension bitset PHP_ARG_ENABLE(reflection, whether to enable reflection support, @@ -8,5 +8,6 @@ if test "$ext_shared" = "yes"; then AC_MSG_ERROR(Cannot build reflection as a shared module) fi + AC_DEFINE(HAVE_REFLECTION, 1, [Whether Reflection is enabled]) PHP_NEW_EXTENSION(reflection, php_reflection.c) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
helly Thu Nov 17 18:20:40 2005 EDT
Modified files:
/php-src/sapi/cli php_cli.c
Log:
- Reflection was moved into its own extension
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.137&r2=1.138&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.137 php-src/sapi/cli/php_cli.c:1.138
--- php-src/sapi/cli/php_cli.c:1.137Thu Nov 17 03:36:11 2005
+++ php-src/sapi/cli/php_cli.c Thu Nov 17 18:20:39 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.137 2005/11/17 08:36:11 sniper Exp $ */
+/* $Id: php_cli.c,v 1.138 2005/11/17 23:20:39 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -28,7 +28,10 @@
#include "zend_hash.h"
#include "zend_modules.h"
#include "zend_interfaces.h"
-#include "zend_reflection_api.h"
+
+#ifdef HAVE_REFLECTION
+#include "ext/reflection/php_reflection.h"
+#endif
#include "SAPI.h"
@@ -133,8 +136,10 @@
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
{'z', 1, "zend-extension"},
+#ifdef HAVE_REFLECTION
{10, 1, "rclass"},
{11, 1, "rextension"},
+#endif
{'-', 0, NULL} /* end of args */
};
@@ -567,7 +572,9 @@
zend_file_handle file_handle;
/* temporary locals */
int behavior=PHP_MODE_STANDARD;
+#ifdef HAVE_REFLECTION
char *reflection_what;
+#endif
int orig_optind=php_optind;
char *orig_optarg=php_optarg;
char *arg_free=NULL, **arg_excp=&arg_free;
@@ -913,6 +920,7 @@
hide_argv = 1;
break;
+#ifdef HAVE_REFLECTION
case 10:
behavior=PHP_MODE_REFLECTION_CLASS;
reflection_what = php_optarg;
@@ -921,7 +929,7 @@
behavior=PHP_MODE_REFLECTION_EXTENSION;
reflection_what = php_optarg;
break;
-
+#endif
default:
break;
}
@@ -1155,6 +1163,7 @@
}
break;
+#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_CLASS:
case PHP_MODE_REFLECTION_EXTENSION:
{
@@ -1205,6 +1214,7 @@
break;
}
+#endif /* reflection */
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c php_reflection.h
helly Thu Nov 17 17:59:41 2005 EDT
Modified files:
/php-src/ext/reflection php_reflection.c php_reflection.h
Log:
- Move Reflection into its own extension
http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1=1.189&r2=1.190&ty=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.189
php-src/ext/reflection/php_reflection.c:1.190
--- php-src/ext/reflection/php_reflection.c:1.189 Tue Nov 15 10:20:19 2005
+++ php-src/ext/reflection/php_reflection.c Thu Nov 17 17:59:38 2005
@@ -19,7 +19,17 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.189 2005/11/15 15:20:19 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.190 2005/11/17 22:59:38 helly Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_ini.h"
+#include "php_reflection.h"
+#include "ext/standard/info.h"
+
#include "zend.h"
#include "zend_API.h"
#include "zend_exceptions.h"
@@ -29,16 +39,34 @@
#include "zend_interfaces.h"
/* Class entry pointers */
-ZEND_API zend_class_entry *reflector_ptr;
-ZEND_API zend_class_entry *reflection_exception_ptr;
-ZEND_API zend_class_entry *reflection_ptr;
-ZEND_API zend_class_entry *reflection_function_ptr;
-ZEND_API zend_class_entry *reflection_parameter_ptr;
-ZEND_API zend_class_entry *reflection_class_ptr;
-ZEND_API zend_class_entry *reflection_object_ptr;
-ZEND_API zend_class_entry *reflection_method_ptr;
-ZEND_API zend_class_entry *reflection_property_ptr;
-ZEND_API zend_class_entry *reflection_extension_ptr;
+PHPAPI zend_class_entry *reflector_ptr;
+PHPAPI zend_class_entry *reflection_exception_ptr;
+PHPAPI zend_class_entry *reflection_ptr;
+PHPAPI zend_class_entry *reflection_function_ptr;
+PHPAPI zend_class_entry *reflection_parameter_ptr;
+PHPAPI zend_class_entry *reflection_class_ptr;
+PHPAPI zend_class_entry *reflection_object_ptr;
+PHPAPI zend_class_entry *reflection_method_ptr;
+PHPAPI zend_class_entry *reflection_property_ptr;
+PHPAPI zend_class_entry *reflection_extension_ptr;
+
+ZEND_BEGIN_MODULE_GLOBALS(reflection)
+ZEND_END_MODULE_GLOBALS(reflection)
+
+#ifdef ZTS
+# define REFLECTION_G(v) \
+ TSRMG(reflection_globals_id, zend_reflection_globals*, v)
+extern int reflection_globals_id;
+#else
+# define REFLECTION_G(v) (reflection_globals.v)
+extern zend_reflection_globals reflectionglobals;
+#endif
+
+#ifdef COMPILE_DL_REFLECTION
+ZEND_GET_MODULE(reflection)
+#endif
+
+ZEND_DECLARE_MODULE_GLOBALS(reflection)
/* Method macros */
@@ -921,7 +949,7 @@
/* }}} */
/* {{{ zend_reflection_class_factory */
-ZEND_API void zend_reflection_class_factory(zend_class_entry *ce, zval *object
TSRMLS_DC)
+PHPAPI void zend_reflection_class_factory(zend_class_entry *ce, zval *object
TSRMLS_DC)
{
reflection_object *intern;
zval *name;
@@ -4132,6 +4160,10 @@
};
/* }}} */
+function_entry reflection_ext_functions[] = { /* {{{ */
+ {NULL, NULL, NULL}
+}; /* }}} */
+
static zend_object_handlers *zend_std_obj_handlers;
/* {{{ _reflection_write_property */
@@ -4152,10 +4184,17 @@
}
/* }}} */
-/* {{{ zend_register_reflection_api */
-ZEND_API void zend_register_reflection_api(TSRMLS_D) {
+static void reflection_init_globals(zend_reflection_globals *globals) /* {{{ */
+{
+ /* Initialize your global struct */
+} /* }}} */
+
+PHP_MINIT_FUNCTION(reflection) /* {{{ */
+{
zend_class_entry _reflection_entry;
+ ZEND_INIT_MODULE_GLOBALS(reflection, reflection_init_globals, NULL);
+
zend_std_obj_handlers = zend_get_std_object_handlers();
memcpy(&reflection_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
reflection_object_handlers.clone_obj = NULL;
@@ -4230,8 +4269,32 @@
REGISTER_MAIN_LONG_CONSTANT("C_IMPLICIT_ABSTRACT",
ZEND_ACC_IMPLICIT_ABSTRACT_CLASS, CONST_PERSISTENT|CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("C_EXPLICIT_ABSTRACT",
ZEND_ACC_EXPLICIT_ABSTRACT_CLASS, CONST_PERSISTENT|CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("C_FINAL", ZEND_ACC_FINAL_CLASS,
CONST_PERSISTENT|CONST_CS);
-}
-/* }}} */
+
+ return SUCCESS;
+} /* }}} */
+
+PHP_MINFO_FUNCTION(reflection) /* {{{ */
+{
+ php_info_print_table_start();
+ php_info_print_table_header(2, "Reflection", "enabled");
+
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.190
2005/11/17 22:59:38 helly Exp $");
+
+ php_info_print_table_end();
+} /* }}} */
+
+zend_module_entry reflection_module_entry = { /* {{{ */
+ STANDARD_MODULE_HEADER,
+ "Reflection",
+ reflection_ext_functions,
+ PHP_MINIT(reflection),
+ NULL,
+ NULL,
+ NULL,
+ PHP_MINFO(reflection),
+ "0.1",
+ STANDARD_MODULE_PROPERTIES
+}; /* }}} */
/*
* Local variables:
http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.h?r1=1.7&r2=1.8&ty=
[PHP-CVS] cvs: php-src / configure.in
helly Thu Nov 17 17:58:08 2005 EDT Modified files: /php-srcconfigure.in Log: - Move Reflection into its own extension http://cvs.php.net/diff.php/php-src/configure.in?r1=1.592&r2=1.593&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.592 php-src/configure.in:1.593 --- php-src/configure.in:1.592 Thu Nov 10 03:06:08 2005 +++ php-src/configure.inThu Nov 17 17:58:07 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.592 2005/11/10 08:06:08 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.593 2005/11/17 22:58:07 helly Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1295,7 +1295,7 @@ if test -r "$abs_srcdir/Zend/zend_objects.c"; then PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_mm.c \ -zend_default_classes.c zend_reflection_api.c) +zend_default_classes.c) fi dnl Selectively disable optimization due to high RAM usage during -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection config.m4 config.w32
helly Thu Nov 17 17:49:08 2005 EDT
Modified files:
/php-src/ext/reflection config.m4 config.w32
Log:
- reflection not reflectino
http://cvs.php.net/diff.php/php-src/ext/reflection/config.m4?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/reflection/config.m4
diff -u php-src/ext/reflection/config.m4:1.1
php-src/ext/reflection/config.m4:1.2
--- php-src/ext/reflection/config.m4:1.1Thu Nov 17 17:42:00 2005
+++ php-src/ext/reflection/config.m4Thu Nov 17 17:49:03 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.1 2005/11/17 22:42:00 helly Exp $
+dnl $Id: config.m4,v 1.2 2005/11/17 22:49:03 helly Exp $
dnl config.m4 for extension bitset
PHP_ARG_ENABLE(reflection, whether to enable reflection support,
@@ -6,7 +6,7 @@
if test "$PHP_REFLECTION" != "no"; then
if test "$ext_shared" = "yes"; then
-AC_MSG_ERROR(Cannot build reflectino as a shared module)
+AC_MSG_ERROR(Cannot build reflection as a shared module)
fi
PHP_NEW_EXTENSION(reflection, php_reflection.c)
fi
http://cvs.php.net/diff.php/php-src/ext/reflection/config.w32?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/reflection/config.w32
diff -u php-src/ext/reflection/config.w32:1.1
php-src/ext/reflection/config.w32:1.2
--- php-src/ext/reflection/config.w32:1.1 Thu Nov 17 17:42:00 2005
+++ php-src/ext/reflection/config.w32 Thu Nov 17 17:49:03 2005
@@ -1,9 +1,9 @@
-// $Id: config.w32,v 1.1 2005/11/17 22:42:00 helly Exp $
+// $Id: config.w32,v 1.2 2005/11/17 22:49:03 helly Exp $
// vim:ft=javascript
ARG_ENABLE("reflection", "disable reflection support", "yes");
if (PHP_REFLECTION != "no") {
- EXTENSION("reflectino", "php_reflection.c");
+ EXTENSION("reflection", "php_reflection.c");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection .cvsignore CREDITS config.m4 config.w32
helly Thu Nov 17 17:42:02 2005 EDT
Added files:
/php-src/ext/reflection CREDITS config.m4 config.w32 .cvsignore
Log:
- Make this an extension
http://cvs.php.net/co.php/php-src/ext/reflection/config.m4?r=1.1&p=1
Index: php-src/ext/reflection/config.m4
+++ php-src/ext/reflection/config.m4
dnl $Id: config.m4,v 1.1 2005/11/17 22:42:00 helly Exp $
dnl config.m4 for extension bitset
PHP_ARG_ENABLE(reflection, whether to enable reflection support,
[ --disable-reflection Disable reflection support])
if test "$PHP_REFLECTION" != "no"; then
if test "$ext_shared" = "yes"; then
AC_MSG_ERROR(Cannot build reflectino as a shared module)
fi
PHP_NEW_EXTENSION(reflection, php_reflection.c)
fi
http://cvs.php.net/co.php/php-src/ext/reflection/config.w32?r=1.1&p=1
Index: php-src/ext/reflection/config.w32
+++ php-src/ext/reflection/config.w32
// $Id: config.w32,v 1.1 2005/11/17 22:42:00 helly Exp $
// vim:ft=javascript
ARG_ENABLE("reflection", "disable reflection support", "yes");
if (PHP_REFLECTION != "no") {
EXTENSION("reflectino", "php_reflection.c");
}
http://cvs.php.net/co.php/php-src/ext/reflection/.cvsignore?r=1.1&p=1
Index: php-src/ext/reflection/.cvsignore
+++ php-src/ext/reflection/.cvsignore
#*#
*.dsw
*.la
*.lo
*.ncb
*.opt
*.plg
*.tgz
*~..#*..deps..libs
Debug
Debug_TS
Makefile
Makefile.fragments
Makefile.global
Makefile.objects
Release
Release_TS
Release_TSDbg
Release_TS_inline
Release_inline
acinclude.m4
aclocal.m4
autom4te.cache
build
config.cache
config.guess
config.h
config.h.in
config.log
config.nice
config.status
config.sub
configure
configure.in
conftest
conftest.c
include
install-sh
libs.mk
libtool
ltmain.sh
missing
mkinstalldirs
modules
scan_makefile_in.awk
*.gcda
*.gcno
xml
html
spl.chm
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/reflection php_reflection_api.c php_reflection_api.h
helly Thu Nov 17 17:35:27 2005 EDT Removed files: (Branch: PHP_5_1) /php-src/ext/reflection php_reflection_api.c php_reflection_api.h Log: - Not in this branch -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/reflection php_reflection_api.c php_reflection_api.h
helly Thu Nov 17 17:34:18 2005 EDT Removed files: (Branch: PHP_5_0) /php-src/ext/reflection php_reflection_api.c php_reflection_api.h Log: - Not in this branch -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rasmus Thu Nov 17 16:57:30 2005 EDT
Modified files:
/php-src/ext/libxml libxml.c
Log:
MFB: missing }}}
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.38&r2=1.39&ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.38 php-src/ext/libxml/libxml.c:1.39
--- php-src/ext/libxml/libxml.c:1.38Mon Oct 17 15:47:23 2005
+++ php-src/ext/libxml/libxml.c Thu Nov 17 16:57:30 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.38 2005/10/17 19:47:23 rrichards Exp $ */
+/* $Id: libxml.c,v 1.39 2005/11/17 21:57:30 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -665,7 +665,6 @@
}
/* }}} */
-
/* {{{ proto void libxml_set_streams_context(resource streams_context)
Set the streams context for the next libxml document load or write */
PHP_FUNCTION(libxml_set_streams_context)
@@ -722,6 +721,7 @@
}
RETURN_BOOL(retval);
}
+/* }}} */
/* {{{ proto object libxml_get_last_error()
Retrieve last error from libxml */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/libxml libxml.c
rasmus Thu Nov 17 16:56:07 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/libxml libxml.c
Log:
Missing }}}
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.32.2.4&r2=1.32.2.5&ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.4
php-src/ext/libxml/libxml.c:1.32.2.5
--- php-src/ext/libxml/libxml.c:1.32.2.4Mon Oct 17 15:50:20 2005
+++ php-src/ext/libxml/libxml.c Thu Nov 17 16:56:04 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.4 2005/10/17 19:50:20 rrichards Exp $ */
+/* $Id: libxml.c,v 1.32.2.5 2005/11/17 21:56:04 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -665,7 +665,6 @@
}
/* }}} */
-
/* {{{ proto void libxml_set_streams_context(resource streams_context)
Set the streams context for the next libxml document load or write */
PHP_FUNCTION(libxml_set_streams_context)
@@ -722,6 +721,7 @@
}
RETURN_BOOL(retval);
}
+/* }}} */
/* {{{ proto object libxml_get_last_error()
Retrieve last error from libxml */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /main php_version.h
iliaa Thu Nov 17 16:27:58 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcconfigure.in /php-src/main php_version.h Log: RC6 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.17&r2=1.579.2.18&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.17 php-src/configure.in:1.579.2.18 --- php-src/configure.in:1.579.2.17 Wed Nov 16 10:41:59 2005 +++ php-src/configure.inThu Nov 17 16:27:56 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.17 2005/11/16 15:41:59 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.18 2005/11/17 21:27:56 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="RC6-dev" +EXTRA_VERSION="RC6" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.112.2.13&r2=1.112.2.14&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.13 php-src/main/php_version.h:1.112.2.14 --- php-src/main/php_version.h:1.112.2.13 Wed Nov 16 10:41:59 2005 +++ php-src/main/php_version.h Thu Nov 17 16:27:58 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "RC6-dev" -#define PHP_VERSION "5.1.0RC6-dev" +#define PHP_EXTRA_VERSION "RC6" +#define PHP_VERSION "5.1.0RC6" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
sniper Thu Nov 17 16:15:21 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: fix news http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.200&r2=1.2027.2.201&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.200 php-src/NEWS:1.2027.2.201 --- php-src/NEWS:1.2027.2.200 Thu Nov 17 16:05:28 2005 +++ php-src/NEWSThu Nov 17 16:15:19 2005 @@ -1,11 +1,10 @@ PHPNEWS ||| 17 Nov 2005, PHP 5.1 Release Candidate 6 -- Moved make ext/date constants be date class constants. (Ilia) -- Resolve Apache 2 regression with sub-request handling on non-linux systems. +- Changed function parameter parsing to handle integers in a non-strict fashion + and to emit an E_NOTICE on badly formed integer values. (Ilia) +- Fixed Apache 2 regression with sub-request handling on non-linux systems. (Ilia, Tony) -- Make zend_parse_params handle integers in a non-strict fashion, but emit an - E_NOTICE on non well formed interger values. (Ilia) - Fixed bug #35249 (compile failure when ext/readline is compiled as shared). (Jani) - Fixed bug #35248 (sqlite_query() doesnt set error_msg when return value is -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug33869.phpt bug34087.phpt bug34676.phpt bug34771.phpt date_create-1.phpt date_default_timezone_set-1.phpt mktime-3.phpt strtotime.phpt
iliaa Thu Nov 17 16:07:27 2005 EDT
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/tests bug33869.phpt bug34087.phpt bug34676.phpt
bug34771.phpt date_create-1.phpt
date_default_timezone_set-1.phpt
mktime-3.phpt strtotime.phpt
Log:
MFB51: Moved date constants into the date class, they all class constants
now.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.66&r2=1.67&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.66 php-src/ext/date/php_date.c:1.67
--- php-src/ext/date/php_date.c:1.66Tue Nov 15 09:07:43 2005
+++ php-src/ext/date/php_date.c Thu Nov 17 16:07:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.66 2005/11/15 14:07:43 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.67 2005/11/17 21:07:26 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -76,8 +76,9 @@
{NULL, NULL, NULL}
};
-#ifdef EXPERIMENTAL_DATE_SUPPORT
+
function_entry date_funcs_date[] = {
+#ifdef EXPERIMENTAL_DATE_SUPPORT
ZEND_NAMED_FE(format, ZEND_FN(date_format), NULL)
ZEND_NAMED_FE(modify, ZEND_FN(date_modify), NULL)
ZEND_NAMED_FE(getTimezone, ZEND_FN(date_timezone_get), NULL)
@@ -86,25 +87,23 @@
ZEND_NAMED_FE(setTime, ZEND_FN(date_time_set), NULL)
ZEND_NAMED_FE(setDate, ZEND_FN(date_date_set), NULL)
ZEND_NAMED_FE(setISODate, ZEND_FN(date_isodate_set), NULL)
+#endif
{NULL, NULL, NULL}
};
function_entry date_funcs_timezone[] = {
+#ifdef EXPERIMENTAL_DATE_SUPPORT
ZEND_NAMED_FE(getName, ZEND_FN(timezone_name_get), NULL)
ZEND_NAMED_FE(getOffset, ZEND_FN(timezone_offset_get), NULL)
ZEND_NAMED_FE(getTransistions, ZEND_FN(timezone_transistions_get), NULL)
ZEND_MALIAS(timezone, listAbbreviations, abbreviations_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_MALIAS(timezone, listIdentifiers, identifiers_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#endif
{NULL, NULL, NULL}
};
-static void date_register_classes(TSRMLS_D);
-# define DATE_REGISTER_CLASSES date_register_classes(TSRMLS_C)
-#else
-# define DATE_REGISTER_CLASSES /* */
-#endif
-
static char* guess_timezone(TSRMLS_D);
+static void date_register_classes(TSRMLS_D);
/* }}} */
ZEND_DECLARE_MODULE_GLOBALS(date)
@@ -119,7 +118,11 @@
PHP_INI_END()
/* }}} */
-#ifdef EXPERIMENTAL_DATE_SUPPORT
+zend_class_entry *date_ce_date, *date_ce_timezone;
+
+static zend_object_handlers date_object_handlers_date;
+static zend_object_handlers date_object_handlers_timezone;
+
typedef struct _php_date_obj php_date_obj;
typedef struct _php_timezone_obj php_timezone_obj;
@@ -133,11 +136,7 @@
timelib_tzinfo *tz;
};
-zend_class_entry *date_ce_date, *date_ce_timezone;
-
-static zend_object_handlers date_object_handlers_date;
-static zend_object_handlers date_object_handlers_timezone;
-
+#ifdef EXPERIMENTAL_DATE_SUPPORT
#define DATE_SET_CONTEXT \
zval *object; \
object = getThis(); \
@@ -156,12 +155,12 @@
} \
obj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC);
\
+#endif
-static zend_object_value date_object_new_date(zend_class_entry *class_type
TSRMLS_DC);
-static zend_object_value date_object_new_timezone(zend_class_entry *class_type
TSRMLS_DC);
static void date_object_free_storage_date(void *object TSRMLS_DC);
static void date_object_free_storage_timezone(void *object TSRMLS_DC);
-#endif
+static zend_object_value date_object_new_date(zend_class_entry *class_type
TSRMLS_DC);
+static zend_object_value date_object_new_timezone(zend_class_entry *class_type
TSRMLS_DC);
/* {{{ Module struct */
zend_module_entry date_module_entry = {
@@ -239,18 +238,7 @@
ZEND_INIT_MODULE_GLOBALS(date, php_date_init_globals, NULL);
REGISTER_INI_ENTRIES();
- DATE_REGISTER_CLASSES;
-
- REGISTER_STRING_CONSTANT("DATE_ATOM",DATE_FORMAT_ISO8601, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_COOKIE", DATE_FORMAT_RFC1123, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_ISO8601", DATE_FORMAT_ISO8601, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_RFC822", DATE_FORMAT_RFC1123, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_RFC850", DATE_FORMAT_RFC1036, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_RFC1036", DATE_FORMAT_RFC1036, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_RFC1123", DATE_FORMAT_RFC1123, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_RFC2822", DATE_FORMAT_RFC2822, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DATE_RSS", DATE_FORMAT_RFC1123, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STR
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c /ext/date/tests bug33869.phpt bug34087.phpt bug34676.phpt bug34771.phpt date_create-1.phpt date_default_timezone_set-1.phpt mktime-3.phpt
iliaa Thu Nov 17 16:05:30 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/date php_date.c
/php-src/ext/date/tests bug33869.phpt bug34087.phpt bug34676.phpt
bug34771.phpt date_create-1.phpt
date_default_timezone_set-1.phpt
mktime-3.phpt strtotime.phpt
Log:
Moved date constants into the date class, they all class constants now.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.199&r2=1.2027.2.200&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.199 php-src/NEWS:1.2027.2.200
--- php-src/NEWS:1.2027.2.199 Thu Nov 17 16:00:28 2005
+++ php-src/NEWSThu Nov 17 16:05:28 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
17 Nov 2005, PHP 5.1 Release Candidate 6
+- Moved make ext/date constants be date class constants. (Ilia)
- Resolve Apache 2 regression with sub-request handling on non-linux systems.
(Ilia, Tony)
- Make zend_parse_params handle integers in a non-strict fashion, but emit an
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.20&r2=1.43.2.21&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.20
php-src/ext/date/php_date.c:1.43.2.21
--- php-src/ext/date/php_date.c:1.43.2.20 Tue Nov 15 09:08:03 2005
+++ php-src/ext/date/php_date.c Thu Nov 17 16:05:30 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.20 2005/11/15 14:08:03 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.43.2.21 2005/11/17 21:05:30 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -74,8 +74,9 @@
{NULL, NULL, NULL}
};
-#ifdef EXPERIMENTAL_DATE_SUPPORT
+
function_entry date_funcs_date[] = {
+#ifdef EXPERIMENTAL_DATE_SUPPORT
ZEND_NAMED_FE(format, ZEND_FN(date_format), NULL)
ZEND_NAMED_FE(modify, ZEND_FN(date_modify), NULL)
ZEND_NAMED_FE(getTimezone, ZEND_FN(date_timezone_get), NULL)
@@ -84,25 +85,23 @@
ZEND_NAMED_FE(setTime, ZEND_FN(date_time_set), NULL)
ZEND_NAMED_FE(setDate, ZEND_FN(date_date_set), NULL)
ZEND_NAMED_FE(setISODate, ZEND_FN(date_isodate_set), NULL)
+#endif
{NULL, NULL, NULL}
};
function_entry date_funcs_timezone[] = {
+#ifdef EXPERIMENTAL_DATE_SUPPORT
ZEND_NAMED_FE(getName, ZEND_FN(timezone_name_get), NULL)
ZEND_NAMED_FE(getOffset, ZEND_FN(timezone_offset_get), NULL)
ZEND_NAMED_FE(getTransistions, ZEND_FN(timezone_transistions_get), NULL)
ZEND_MALIAS(timezone, listAbbreviations, abbreviations_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_MALIAS(timezone, listIdentifiers, identifiers_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#endif
{NULL, NULL, NULL}
};
-static void date_register_classes(TSRMLS_D);
-# define DATE_REGISTER_CLASSES date_register_classes(TSRMLS_C)
-#else
-# define DATE_REGISTER_CLASSES /* */
-#endif
-
static char* guess_timezone(TSRMLS_D);
+static void date_register_classes(TSRMLS_D);
/* }}} */
ZEND_DECLARE_MODULE_GLOBALS(date)
@@ -117,7 +116,11 @@
PHP_INI_END()
/* }}} */
-#ifdef EXPERIMENTAL_DATE_SUPPORT
+zend_class_entry *date_ce_date, *date_ce_timezone;
+
+static zend_object_handlers date_object_handlers_date;
+static zend_object_handlers date_object_handlers_timezone;
+
typedef struct _php_date_obj php_date_obj;
typedef struct _php_timezone_obj php_timezone_obj;
@@ -131,11 +134,7 @@
timelib_tzinfo *tz;
};
-zend_class_entry *date_ce_date, *date_ce_timezone;
-
-static zend_object_handlers date_object_handlers_date;
-static zend_object_handlers date_object_handlers_timezone;
-
+#ifdef EXPERIMENTAL_DATE_SUPPORT
#define DATE_SET_CONTEXT \
zval *object; \
object = getThis(); \
@@ -154,12 +153,12 @@
} \
obj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC);
\
+#endif
-static zend_object_value date_object_new_date(zend_class_entry *class_type
TSRMLS_DC);
-static zend_object_value date_object_new_timezone(zend_class_entry *class_type
TSRMLS_DC);
static void date_object_free_storage_date(void *object TSRMLS_DC);
static void date_object_free_storage_timezone(void *object TSRMLS_DC);
-#endif
+static zend_object_value date_object_new_date(zend_class_entry *class_type
TSRMLS_DC);
+static zend_object_value date_object_new_timezone(zend_class_entry *class_type
TSRMLS_DC);
/* {{{ Module struct */
zend_module_entry date_module_entry = {
@@ -237,18 +236,7 @@
ZEND_INIT_MODULE_GLOBALS(date, php_date_init_globals, NULL);
REGISTER_INI_ENTRIES();
- DATE_REGISTER_CLASSES;
-
- REGISTER_STRING_CONSTANT("DATE_ATOM",DATE_FORMAT_ISO8601, CONST_CS
| CONST_PERSISTENT);
- REGISTER_STRING_CONSTANT("DA
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /sapi/apache2handler sapi_apache2.c
iliaa Thu Nov 17 16:01:15 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/sapi/apache2handlersapi_apache2.c
/php-srcNEWS
Log:
MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.40.2.6&r2=1.1.2.40.2.7&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.6
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.7
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.6 Wed Nov 2
12:55:17 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 17 16:01:13 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40.2.6 2005/11/02 17:55:17 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.7 2005/11/17 21:01:13 iliaa Exp $ */
#include
@@ -457,6 +457,7 @@
if (strcmp(r->protocol, "INCLUDED")) { \
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context),
php_server_context_cleanup); \
conf = ap_get_module_config(r->per_dir_config, &php4_module);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.79&r2=1.1247.2.920.2.80&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.79 php-src/NEWS:1.1247.2.920.2.80
--- php-src/NEWS:1.1247.2.920.2.79 Thu Nov 17 09:21:09 2005
+++ php-src/NEWSThu Nov 17 16:01:13 2005
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||
?? ??? 2006, Version 4.4.2
+- Resolve Apache 2 regression with sub-request handling on non-linux systems.
+ (Ilia, Tony)
- Backport missing imap_mailcompose fixes from 5.X. (Ilia)
- Added missing safe_mode/open_basedir checks in cURL extension. (Ilia)
- Fixed bug #35257 (Calling ob_flush after creating an ob callback causes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /sapi/apache2handler sapi_apache2.c
iliaa Thu Nov 17 16:00:29 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/apache2handlersapi_apache2.c
/php-srcNEWS
Log:
MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.5&r2=1.57.2.6&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.5
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.6
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.5 Wed Oct 26 11:08:23 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 17 16:00:28 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.5 2005/10/26 15:08:23 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.6 2005/11/17 21:00:28 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -457,6 +457,7 @@
if (strcmp(r->protocol, "INCLUDED")) { \
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context),
php_server_context_cleanup); \
conf = ap_get_module_config(r->per_dir_config, &php5_module);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.198&r2=1.2027.2.199&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.198 php-src/NEWS:1.2027.2.199
--- php-src/NEWS:1.2027.2.198 Thu Nov 17 09:38:35 2005
+++ php-src/NEWSThu Nov 17 16:00:28 2005
@@ -1,6 +1,8 @@
PHPNEWS
|||
17 Nov 2005, PHP 5.1 Release Candidate 6
+- Resolve Apache 2 regression with sub-request handling on non-linux systems.
+ (Ilia, Tony)
- Make zend_parse_params handle integers in a non-strict fashion, but emit an
E_NOTICE on non well formed interger values. (Ilia)
- Fixed bug #35249 (compile failure when ext/readline is compiled as shared).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
iliaa Thu Nov 17 15:56:09 2005 EDT
Modified files:
/php-src/sapi/apache2handlersapi_apache2.c
Log:
Hopefully resolve all the Apache 2 sub-request problems on non-linux systems.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.62&r2=1.63&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.62
php-src/sapi/apache2handler/sapi_apache2.c:1.63
--- php-src/sapi/apache2handler/sapi_apache2.c:1.62 Wed Oct 26 11:08:42 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Nov 17 15:56:09 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.62 2005/10/26 15:08:42 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.63 2005/11/17 20:56:09 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -457,6 +457,7 @@
if (strcmp(r->protocol, "INCLUDED")) { \
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
+ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context),
php_server_context_cleanup); \
conf = ap_get_module_config(r->per_dir_config, &php5_module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard php_fopen_wrapper.c
pollita Thu Nov 17 14:41:02 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard php_fopen_wrapper.c
Log:
MFH (r-1.51) #32371 php://input sometimes returns duplicate data
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.29.2.4&r2=1.29.2.4.8.1&ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4
php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4.8.1
--- php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4 Tue May 13 19:51:57 2003
+++ php-src/ext/standard/php_fopen_wrapper.cThu Nov 17 14:41:02 2005
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.29.2.4 2003/05/13 23:51:57 sas Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.29.2.4.8.1 2005/11/17 19:41:02 pollita Exp $ */
#include
#include
@@ -73,17 +73,19 @@
static size_t php_stream_input_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
{
+ off_t *position = (off_t*)stream->position;
size_t read_bytes = 0;
+
if(!stream->eof) {
if(SG(request_info).raw_post_data) { /* data has already been
read by a post handler */
- read_bytes = SG(request_info).raw_post_data_length -
stream->position;
+ read_bytes = SG(request_info).raw_post_data_length -
*position;
if(read_bytes <= count) {
stream->eof = 1;
} else {
read_bytes = count;
}
if(read_bytes) {
- memcpy(buf, SG(request_info).raw_post_data +
stream->position, read_bytes);
+ memcpy(buf, SG(request_info).raw_post_data +
*position, read_bytes);
}
} else if(sapi_module.read_post) {
read_bytes = sapi_module.read_post(buf, count
TSRMLS_CC);
@@ -95,12 +97,16 @@
stream->eof = 1;
}
}
+
+ *position += read_bytes;
SG(read_post_bytes) += read_bytes;
return read_bytes;
}
static int php_stream_input_close(php_stream *stream, int close_handle
TSRMLS_DC)
{
+ efree(stream->abstract);
+
return 0;
}
@@ -134,7 +140,7 @@
}
if (!strcasecmp(path, "input")) {
- return php_stream_alloc(&php_stream_input_ops, NULL, 0, "rb");
+ return php_stream_alloc(&php_stream_input_ops, ecalloc(1,
sizeof(off_t)), 0, "rb");
}
if (!strcasecmp(path, "stdin")) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard php_fopen_wrapper.c
pollita Thu Nov 17 14:40:52 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard php_fopen_wrapper.c
Log:
MFH (r-1.51) #32371 php://input sometimes returns duplicate data
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.44&r2=1.44.2.1&ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.44
php-src/ext/standard/php_fopen_wrapper.c:1.44.2.1
--- php-src/ext/standard/php_fopen_wrapper.c:1.44 Mon Apr 19 13:41:39 2004
+++ php-src/ext/standard/php_fopen_wrapper.cThu Nov 17 14:40:52 2005
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.44 2004/04/19 17:41:39 wez Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.44.2.1 2005/11/17 19:40:52 pollita Exp $ */
#include
#include
@@ -73,17 +73,19 @@
static size_t php_stream_input_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
{
+ off_t *position = (off_t*)stream->abstract;
size_t read_bytes = 0;
+
if(!stream->eof) {
if(SG(request_info).raw_post_data) { /* data has already been
read by a post handler */
- read_bytes = SG(request_info).raw_post_data_length -
stream->position;
+ read_bytes = SG(request_info).raw_post_data_length -
*position;
if(read_bytes <= count) {
stream->eof = 1;
} else {
read_bytes = count;
}
if(read_bytes) {
- memcpy(buf, SG(request_info).raw_post_data +
stream->position, read_bytes);
+ memcpy(buf, SG(request_info).raw_post_data +
*position, read_bytes);
}
} else if(sapi_module.read_post) {
read_bytes = sapi_module.read_post(buf, count
TSRMLS_CC);
@@ -96,12 +98,15 @@
}
}
+ *position += read_bytes;
SG(read_post_bytes) += read_bytes;
return read_bytes;
}
static int php_stream_input_close(php_stream *stream, int close_handle
TSRMLS_DC)
{
+ efree(stream->abstract);
+
return 0;
}
@@ -162,7 +167,7 @@
}
if (!strcasecmp(path, "input")) {
- return php_stream_alloc(&php_stream_input_ops, NULL, 0, "rb");
+ return php_stream_alloc(&php_stream_input_ops, ecalloc(1,
sizeof(off_t)), 0, "rb");
}
if (!strcasecmp(path, "stdin")) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard php_fopen_wrapper.c
pollita Thu Nov 17 14:40:39 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard php_fopen_wrapper.c
Log:
MFH (r-1.51) #32371 php://input sometimes returns duplicate data
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.1&r2=1.45.2.2&ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.1
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.2
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.1 Thu Aug 18 09:34:41 2005
+++ php-src/ext/standard/php_fopen_wrapper.cThu Nov 17 14:40:38 2005
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.45.2.1 2005/08/18 13:34:41 sniper Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.45.2.2 2005/11/17 19:40:38 pollita Exp $ */
#include
#include
@@ -73,17 +73,19 @@
static size_t php_stream_input_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
{
+ off_t *position = (off_t*)stream->abstract;
size_t read_bytes = 0;
+
if(!stream->eof) {
if(SG(request_info).raw_post_data) { /* data has already been
read by a post handler */
- read_bytes = SG(request_info).raw_post_data_length -
stream->position;
+ read_bytes = SG(request_info).raw_post_data_length -
*position;
if(read_bytes <= count) {
stream->eof = 1;
} else {
read_bytes = count;
}
if(read_bytes) {
- memcpy(buf, SG(request_info).raw_post_data +
stream->position, read_bytes);
+ memcpy(buf, SG(request_info).raw_post_data +
*position, read_bytes);
}
} else if(sapi_module.read_post) {
read_bytes = sapi_module.read_post(buf, count
TSRMLS_CC);
@@ -96,12 +98,15 @@
}
}
+ *position += read_bytes;
SG(read_post_bytes) += read_bytes;
return read_bytes;
}
static int php_stream_input_close(php_stream *stream, int close_handle
TSRMLS_DC)
{
+ efree(stream->abstract);
+
return 0;
}
@@ -162,7 +167,7 @@
}
if (!strcasecmp(path, "input")) {
- return php_stream_alloc(&php_stream_input_ops, NULL, 0, "rb");
+ return php_stream_alloc(&php_stream_input_ops, ecalloc(1,
sizeof(off_t)), 0, "rb");
}
if (!strcasecmp(path, "stdin")) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard php_fopen_wrapper.c
pollita Thu Nov 17 14:39:40 2005 EDT
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
Log:
Bugfix #32371 php://input sometimes returns duplicate data
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.50&r2=1.51&ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.50
php-src/ext/standard/php_fopen_wrapper.c:1.51
--- php-src/ext/standard/php_fopen_wrapper.c:1.50 Fri Nov 11 11:51:24 2005
+++ php-src/ext/standard/php_fopen_wrapper.cThu Nov 17 14:39:39 2005
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.50 2005/11/11 16:51:24 helly Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.51 2005/11/17 19:39:39 pollita Exp $ */
#include
#include
@@ -73,17 +73,19 @@
static size_t php_stream_input_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
{
+ off_t *position = (off_t*)stream->abstract;
size_t read_bytes = 0;
+
if(!stream->eof) {
if(SG(request_info).raw_post_data) { /* data has already been
read by a post handler */
- read_bytes = SG(request_info).raw_post_data_length -
stream->position;
+ read_bytes = SG(request_info).raw_post_data_length -
*position;
if(read_bytes <= count) {
stream->eof = 1;
} else {
read_bytes = count;
}
if(read_bytes) {
- memcpy(buf, SG(request_info).raw_post_data +
stream->position, read_bytes);
+ memcpy(buf, SG(request_info).raw_post_data +
*position, read_bytes);
}
} else if(sapi_module.read_post) {
read_bytes = sapi_module.read_post(buf, count
TSRMLS_CC);
@@ -96,12 +98,15 @@
}
}
+ *position += read_bytes;
SG(read_post_bytes) += read_bytes;
return read_bytes;
}
static int php_stream_input_close(php_stream *stream, int close_handle
TSRMLS_DC)
{
+ efree(stream->abstract);
+
return 0;
}
@@ -181,7 +186,7 @@
}
if (!strcasecmp(path, "input")) {
- return php_stream_alloc(&php_stream_input_ops, NULL, 0, "rb");
+ return php_stream_alloc(&php_stream_input_ops, ecalloc(1,
sizeof(off_t)), 0, "rb");
}
if (!strcasecmp(path, "stdin")) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests bug35218.phpt
iliaa Thu Nov 17 13:25:49 2005 EDT Modified files: /php-src/ext/date/tests bug35218.phpt Log: MFB51: fixed test http://cvs.php.net/diff.php/php-src/ext/date/tests/bug35218.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/date/tests/bug35218.phpt diff -u php-src/ext/date/tests/bug35218.phpt:1.2 php-src/ext/date/tests/bug35218.phpt:1.3 --- php-src/ext/date/tests/bug35218.phpt:1.2Thu Nov 17 08:15:01 2005 +++ php-src/ext/date/tests/bug35218.phptThu Nov 17 13:25:48 2005 @@ -2,7 +2,7 @@ Bug #35218 (strtotime no longer ignores timezone comments like "(PST)") --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date/tests bug35218.phpt
iliaa Thu Nov 17 13:25:18 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/date/tests bug35218.phpt Log: Fixed test. http://cvs.php.net/diff.php/php-src/ext/date/tests/bug35218.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/date/tests/bug35218.phpt diff -u php-src/ext/date/tests/bug35218.phpt:1.1.2.1 php-src/ext/date/tests/bug35218.phpt:1.1.2.2 --- php-src/ext/date/tests/bug35218.phpt:1.1.2.1Thu Nov 17 08:04:31 2005 +++ php-src/ext/date/tests/bug35218.phptThu Nov 17 13:25:16 2005 @@ -2,7 +2,7 @@ Bug #35218 (strtotime no longer ignores timezone comments like "(PST)") --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main/streams plain_wrapper.c
On 17.11.2005 20:51, Andrei Zmievski wrote: Right, to me set_blocking(true) should only enable blocking, not toggle it. Wez, what was your reasoning for voting "yes"? That's exactly what it does after the patch =) -- Wbr, Antony Dovgal -- 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_1) / NEWS /main/streams plain_wrapper.c
Right, to me set_blocking(true) should only enable blocking, not toggle it. Wez, what was your reasoning for voting "yes"? - A On Nov 17, 2005, at 9:09 AM, Antony Dovgal wrote: On 17.11.2005 20:03, Andrei Zmievski wrote: Why? Is it consistent with other functions that enable/disable things? It doesn't look consistent for me. If I want to enable something and the function disables it - it's definitely not what I expected to see. Also, Wez said "yes" to the patch. -- Wbr, Antony Dovgal -- 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_1) / NEWS /main/streams plain_wrapper.c
On 17.11.2005 20:03, Andrei Zmievski wrote: Why? Is it consistent with other functions that enable/disable things? It doesn't look consistent for me. If I want to enable something and the function disables it - it's definitely not what I expected to see. Also, Wez said "yes" to the patch. -- Wbr, Antony Dovgal -- 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_1) / NEWS /main/streams plain_wrapper.c
Why? Is it consistent with other functions that enable/disable things? - A On Nov 17, 2005, at 6:19 AM, Antony Dovgal wrote: tony2001Thu Nov 17 09:19:40 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/main/streams plain_wrapper.c Log: MFH: fix #35079 (stream_set_blocking(true) toggles, not enables blocking) patch by askalski at gmail dot com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c /ext/sqlite/tests bug35248.phpt
iliaa Thu Nov 17 09:40:11 2005 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite/tests bug35248.phpt
Log:
MFB51: Fixed bug #35248 (sqlite_query() doesnt set error_msg when return
value is being used).
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.176&r2=1.177&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.176 php-src/ext/sqlite/sqlite.c:1.177
--- php-src/ext/sqlite/sqlite.c:1.176 Mon Nov 14 16:52:26 2005
+++ php-src/ext/sqlite/sqlite.c Thu Nov 17 09:40:11 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+--+
- $Id: sqlite.c,v 1.176 2005/11/14 21:52:26 tony2001 Exp $
+ $Id: sqlite.c,v 1.177 2005/11/17 14:40:11 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1126,7 +1126,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.176 2005/11/14 21:52:26 tony2001
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.177 2005/11/17 14:40:11 iliaa Exp
$");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1517,7 +1517,7 @@
/* }}} */
/* {{{ sqlite_query */
-void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long
sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result
**prres TSRMLS_DC)
+void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long
sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result
**prres, zval *errmsg TSRMLS_DC)
{
struct php_sqlite_result res, *rres;
int ret;
@@ -1533,6 +1533,9 @@
if (ret != SQLITE_OK) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+ if (errmsg) {
+ ZVAL_STRING(errmsg, errtext, 1);
+ }
sqlite_freemem(errtext);
goto terminate;
} else if (!res.vm) { /* empty query */
@@ -1633,7 +1636,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value, NULL
TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value,
NULL, errmsg TSRMLS_CC);
}
/* }}} */
@@ -1774,7 +1777,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value, NULL
TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value,
NULL, errmsg TSRMLS_CC);
}
/* }}} */
@@ -2209,7 +2212,7 @@
}
rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
- sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres
TSRMLS_CC);
+ sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres, NULL
TSRMLS_CC);
if (db->last_err_code != SQLITE_OK) {
if (rres) {
efree(rres);
@@ -2342,7 +2345,7 @@
}
rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
- sqlite_query(NULL, db, sql, sql_len, PHPSQLITE_NUM, 0, NULL, &rres
TSRMLS_CC);
+ sqlite_query(NULL, db, sql, sql_len, PHPSQLITE_NUM, 0, NULL, &rres,
NULL TSRMLS_CC);
if (db->last_err_code != SQLITE_OK) {
if (rres) {
efree(rres);
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/bug35248.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/sqlite/tests/bug35248.phpt
diff -u /dev/null php-src/ext/sqlite/tests/bug35248.phpt:1.2
--- /dev/null Thu Nov 17 09:40:11 2005
+++ php-src/ext/sqlite/tests/bug35248.phpt Thu Nov 17 09:40:11 2005
@@ -0,0 +1,15 @@
+--TEST--
+Bug #35248 (sqlite_query does not return parse error message)
+--SKIPIF--
+
+--FILE--
+
+--EXPECT--
+string(30) "near "asdfesdfa": syntax error"
+string(30) "near "asdfesdfa": syntax error"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/sqlite sqlite.c /ext/sqlite/tests bug35248.phpt
iliaa Thu Nov 17 09:38:36 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/sqlite/tests bug35248.phpt
Modified files:
/php-src/ext/sqlite sqlite.c
/php-srcNEWS
Log:
Fixed bug #35248 (sqlite_query() doesnt set error_msg when return value is
being used).
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.166.2.5&r2=1.166.2.6&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.5
php-src/ext/sqlite/sqlite.c:1.166.2.6
--- php-src/ext/sqlite/sqlite.c:1.166.2.5 Mon Nov 14 17:02:58 2005
+++ php-src/ext/sqlite/sqlite.c Thu Nov 17 09:38:32 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+--+
- $Id: sqlite.c,v 1.166.2.5 2005/11/14 22:02:58 tony2001 Exp $
+ $Id: sqlite.c,v 1.166.2.6 2005/11/17 14:38:32 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1125,7 +1125,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.5 2005/11/14 22:02:58
tony2001 Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.6 2005/11/17 14:38:32 iliaa
Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1516,7 +1516,7 @@
/* }}} */
/* {{{ sqlite_query */
-void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long
sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result
**prres TSRMLS_DC)
+void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long
sql_len, int mode, int buffered, zval *return_value, struct php_sqlite_result
**prres, zval *errmsg TSRMLS_DC)
{
struct php_sqlite_result res, *rres;
int ret;
@@ -1532,6 +1532,9 @@
if (ret != SQLITE_OK) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errtext);
+ if (errmsg) {
+ ZVAL_STRING(errmsg, errtext, 1);
+ }
sqlite_freemem(errtext);
goto terminate;
} else if (!res.vm) { /* empty query */
@@ -1632,7 +1635,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value, NULL
TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value,
NULL, errmsg TSRMLS_CC);
}
/* }}} */
@@ -1757,7 +1760,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value, NULL
TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value,
NULL, errmsg TSRMLS_CC);
}
/* }}} */
@@ -2168,7 +2171,7 @@
}
rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
- sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres
TSRMLS_CC);
+ sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres, NULL
TSRMLS_CC);
if (db->last_err_code != SQLITE_OK) {
if (rres) {
efree(rres);
@@ -2284,7 +2287,7 @@
}
rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
- sqlite_query(NULL, db, sql, sql_len, PHPSQLITE_NUM, 0, NULL, &rres
TSRMLS_CC);
+ sqlite_query(NULL, db, sql, sql_len, PHPSQLITE_NUM, 0, NULL, &rres,
NULL TSRMLS_CC);
if (db->last_err_code != SQLITE_OK) {
if (rres) {
efree(rres);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.197&r2=1.2027.2.198&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.197 php-src/NEWS:1.2027.2.198
--- php-src/NEWS:1.2027.2.197 Thu Nov 17 09:19:39 2005
+++ php-src/NEWSThu Nov 17 09:38:35 2005
@@ -1,6 +1,18 @@
PHPNEWS
|||
+17 Nov 2005, PHP 5.1 Release Candidate 6
+- Make zend_parse_params handle integers in a non-strict fashion, but emit an
+ E_NOTICE on non well formed interger values. (Ilia)
+- Fixed bug #35249 (compile failure when ext/readline is compiled as shared).
+ (Jani)
+- Fixed bug #35248 (sqlite_query() doesnt set error_msg when return value is
+ being used). (Ilia)
+- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables
+ blocking). (askalski at gmail dot com, Tony)
+
16 Nov 2005, PHP 5.1 Release Candidate 5
+- Added an E_STRICT warning on the usage of {} for accessing of string offsets.
+ (Ilia)
- Changed type hints to allow "null" as default value for class and array.
(Marcus, Derick, Dmitry)
- Fixed __get/__set to allow re
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /main streams.c
tony2001Thu Nov 17 09:21:11 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS /php-src/main streams.c Log: MFH: fix #35079 (stream_set_blocking(true) toggles, not enables blocking) patch by askalski at gmail dot com http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.78&r2=1.1247.2.920.2.79&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.78 php-src/NEWS:1.1247.2.920.2.79 --- php-src/NEWS:1.1247.2.920.2.78 Thu Nov 17 06:42:35 2005 +++ php-src/NEWSThu Nov 17 09:21:09 2005 @@ -5,6 +5,8 @@ - Added missing safe_mode/open_basedir checks in cURL extension. (Ilia) - Fixed bug #35257 (Calling ob_flush after creating an ob callback causes segfault). (Tony) +- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables + blocking). (askalski at gmail dot com, Tony) - Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani) - Fixed bug #35071 (Wrong fopen mode used in GD safe-mode checks). (Jani) - Fixed bug #35067, #35063 (key(),current() need to work by reference). (Ilia) http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.100&r2=1.125.2.100.2.1&ty=u Index: php-src/main/streams.c diff -u php-src/main/streams.c:1.125.2.100 php-src/main/streams.c:1.125.2.100.2.1 --- php-src/main/streams.c:1.125.2.100 Tue May 24 06:14:16 2005 +++ php-src/main/streams.c Thu Nov 17 09:21:10 2005 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: streams.c,v 1.125.2.100 2005/05/24 10:14:16 tony2001 Exp $ */ +/* $Id: streams.c,v 1.125.2.100.2.1 2005/11/17 14:21:10 tony2001 Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -1667,7 +1667,7 @@ flags = fcntl(fd, F_GETFL, 0); oldval = (flags & O_NONBLOCK) ? 0 : 1; if (value) - flags ^= O_NONBLOCK; + flags &= ~O_NONBLOCK; else flags |= O_NONBLOCK; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /main/streams plain_wrapper.c
tony2001Thu Nov 17 09:20:04 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/main/streams plain_wrapper.c Log: MFH: fix #35079 (stream_set_blocking(true) toggles, not enables blocking) patch by askalski at gmail dot com http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.514&r2=1.1760.2.515&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.514 php-src/NEWS:1.1760.2.515 --- php-src/NEWS:1.1760.2.514 Wed Nov 16 06:51:51 2005 +++ php-src/NEWSThu Nov 17 09:20:03 2005 @@ -8,6 +8,8 @@ - Fixed bug #35229 (call_user_func() crashes when arguement_stack is nearly full). (Dmitry) - Fixed bug #35197 (Destructor is not called). (Tony) +- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables + blocking). (askalski at gmail dot com, Tony) - Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared). (Dmitry) - Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.39.2.7&r2=1.39.2.8&ty=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.39.2.7 php-src/main/streams/plain_wrapper.c:1.39.2.8 --- php-src/main/streams/plain_wrapper.c:1.39.2.7 Tue May 24 06:14:05 2005 +++ php-src/main/streams/plain_wrapper.cThu Nov 17 09:20:04 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: plain_wrapper.c,v 1.39.2.7 2005/05/24 10:14:05 tony2001 Exp $ */ +/* $Id: plain_wrapper.c,v 1.39.2.8 2005/11/17 14:20:04 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -533,7 +533,7 @@ flags = fcntl(fd, F_GETFL, 0); oldval = (flags & O_NONBLOCK) ? 0 : 1; if (value) - flags ^= O_NONBLOCK; + flags &= ~O_NONBLOCK; else flags |= O_NONBLOCK; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main/streams plain_wrapper.c
tony2001Thu Nov 17 09:19:40 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/main/streams plain_wrapper.c Log: MFH: fix #35079 (stream_set_blocking(true) toggles, not enables blocking) patch by askalski at gmail dot com http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.196&r2=1.2027.2.197&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.196 php-src/NEWS:1.2027.2.197 --- php-src/NEWS:1.2027.2.196 Wed Nov 16 09:17:55 2005 +++ php-src/NEWSThu Nov 17 09:19:39 2005 @@ -19,6 +19,8 @@ - Fixed bug #35142 (SOAP Client/Server Complex Object Support). (Dmitry) - Fixed bug #35135 (PDOStatment without related PDO object may crash). (Ilia) - Fixed bug #35091 (SoapClient leaks memory). (Dmitry) +- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables + blocking). (askalski at gmail dot com, Tony) - Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani) - Fixed bugs #35022, #35019 (Regression in the behavior of key() and current() functions). (Ilia) http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.52.2.1&r2=1.52.2.2&ty=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.52.2.1 php-src/main/streams/plain_wrapper.c:1.52.2.2 --- php-src/main/streams/plain_wrapper.c:1.52.2.1 Fri Aug 26 08:56:07 2005 +++ php-src/main/streams/plain_wrapper.cThu Nov 17 09:19:40 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: plain_wrapper.c,v 1.52.2.1 2005/08/26 12:56:07 derick Exp $ */ +/* $Id: plain_wrapper.c,v 1.52.2.2 2005/11/17 14:19:40 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -540,7 +540,7 @@ flags = fcntl(fd, F_GETFL, 0); oldval = (flags & O_NONBLOCK) ? 0 : 1; if (value) - flags ^= O_NONBLOCK; + flags &= ~O_NONBLOCK; else flags |= O_NONBLOCK; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
tony2001Thu Nov 17 09:19:09 2005 EDT Modified files: /php-src/main/streams plain_wrapper.c Log: fix #35079 (stream_set_blocking(true) toggles, not enables blocking) patch by askalski at gmail dot com http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.53&r2=1.54&ty=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.53 php-src/main/streams/plain_wrapper.c:1.54 --- php-src/main/streams/plain_wrapper.c:1.53 Fri Aug 26 08:50:06 2005 +++ php-src/main/streams/plain_wrapper.cThu Nov 17 09:19:06 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: plain_wrapper.c,v 1.53 2005/08/26 12:50:06 derick Exp $ */ +/* $Id: plain_wrapper.c,v 1.54 2005/11/17 14:19:06 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -540,7 +540,7 @@ flags = fcntl(fd, F_GETFL, 0); oldval = (flags & O_NONBLOCK) ? 0 : 1; if (value) - flags ^= O_NONBLOCK; + flags &= ~O_NONBLOCK; else flags |= O_NONBLOCK; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: Your document
Your document is attached. +++ Attachment: No Virus found +++ Kaspersky AntiVirus - www.kaspersky.com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date/lib README
derick Thu Nov 17 07:33:40 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/date/lib README Log: - Fixed typo http://cvs.php.net/diff.php/php-src/ext/date/lib/README?r1=1.4.2.1&r2=1.4.2.2&ty=u Index: php-src/ext/date/lib/README diff -u php-src/ext/date/lib/README:1.4.2.1 php-src/ext/date/lib/README:1.4.2.2 --- php-src/ext/date/lib/README:1.4.2.1 Thu Nov 17 04:58:22 2005 +++ php-src/ext/date/lib/README Thu Nov 17 07:33:36 2005 @@ -3,4 +3,4 @@ Make sure you use re2c 0.9.10 or higher: -/dat/dev/sf/re2c/re2c -d -b -o ext/date/parse_date.c ext/date/parse_date.re +/dat/dev/sf/re2c/re2c -d -b -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main output.c
tony2001Thu Nov 17 07:03:00 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/main output.c
Log:
fix #35257 in a smarter way
http://cvs.php.net/diff.php/php-src/main/output.c?r1=1.142.2.16.2.2&r2=1.142.2.16.2.3&ty=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.142.2.16.2.2
php-src/main/output.c:1.142.2.16.2.3
--- php-src/main/output.c:1.142.2.16.2.2Thu Nov 17 06:42:40 2005
+++ php-src/main/output.c Thu Nov 17 07:02:57 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: output.c,v 1.142.2.16.2.2 2005/11/17 11:42:40 tony2001 Exp $ */
+/* $Id: output.c,v 1.142.2.16.2.3 2005/11/17 12:02:57 tony2001 Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -296,7 +296,7 @@
OG(ob_nesting_level)--;
if (send_buffer) {
- if (just_flush && strlen(final_buffer)) { /* if flush is called
prior to proper end, ensure presence of NUL */
+ if (just_flush && final_buffer[0] != '\0') { /* if flush is
called prior to proper end, ensure presence of NUL */
final_buffer[final_buffer_length] = '\0';
}
OG(php_body_write)(final_buffer, final_buffer_length TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /main output.c
tony2001Thu Nov 17 06:42:41 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/main output.c
Log:
fix #35257 (Calling ob_flush after creating an ob callback causes segfault)
***
The issue is 4.x specific and cannot be reproduced in 5.x, because in 5.x we
allocate empty strings, while in 4.x we're using empty_string macro.
***
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.77&r2=1.1247.2.920.2.78&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.77 php-src/NEWS:1.1247.2.920.2.78
--- php-src/NEWS:1.1247.2.920.2.77 Wed Nov 9 10:41:07 2005
+++ php-src/NEWSThu Nov 17 06:42:35 2005
@@ -3,6 +3,8 @@
?? ??? 2006, Version 4.4.2
- Backport missing imap_mailcompose fixes from 5.X. (Ilia)
- Added missing safe_mode/open_basedir checks in cURL extension. (Ilia)
+- Fixed bug #35257 (Calling ob_flush after creating an ob callback causes
+ segfault). (Tony)
- Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani)
- Fixed bug #35071 (Wrong fopen mode used in GD safe-mode checks). (Jani)
- Fixed bug #35067, #35063 (key(),current() need to work by reference). (Ilia)
http://cvs.php.net/diff.php/php-src/main/output.c?r1=1.142.2.16.2.1&r2=1.142.2.16.2.2&ty=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.142.2.16.2.1
php-src/main/output.c:1.142.2.16.2.2
--- php-src/main/output.c:1.142.2.16.2.1Wed Aug 24 12:20:12 2005
+++ php-src/main/output.c Thu Nov 17 06:42:40 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: output.c,v 1.142.2.16.2.1 2005/08/24 16:20:12 iliaa Exp $ */
+/* $Id: output.c,v 1.142.2.16.2.2 2005/11/17 11:42:40 tony2001 Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -240,7 +240,7 @@
OG(ob_lock) = 1;
if (call_user_function_ex(CG(function_table), NULL,
OG(active_ob_buffer).output_handler, &alternate_buffer, 2, params, 1, NULL
TSRMLS_CC)==SUCCESS) {
- if (!(Z_TYPE_P(alternate_buffer)==IS_BOOL &&
Z_BVAL_P(alternate_buffer)==0)) {
+ if (alternate_buffer &&
!(Z_TYPE_P(alternate_buffer)==IS_BOOL && Z_BVAL_P(alternate_buffer)==0)) {
convert_to_string_ex(&alternate_buffer);
final_buffer = Z_STRVAL_P(alternate_buffer);
final_buffer_length =
Z_STRLEN_P(alternate_buffer);
@@ -296,7 +296,7 @@
OG(ob_nesting_level)--;
if (send_buffer) {
- if (just_flush) { /* if flush is called prior to proper end,
ensure presence of NUL */
+ if (just_flush && strlen(final_buffer)) { /* if flush is called
prior to proper end, ensure presence of NUL */
final_buffer[final_buffer_length] = '\0';
}
OG(php_body_write)(final_buffer, final_buffer_length TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/pcre config.m4
sniper Thu Nov 17 05:03:23 2005 EDT Removed files: (Branch: PHP_4_4) /php-src/ext/pcre config.m4 Log: MFH -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pcre config.m4
sniper Thu Nov 17 05:02:43 2005 EDT Removed files: (Branch: PHP_5_1) /php-src/ext/pcre config.m4 Log: MFH: Renamed config.m4 to config0.m4 # PCRE configure tests must be run before e.g. ext/filter -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre config.m4
sniper Thu Nov 17 05:01:49 2005 EDT Removed files: /php-src/ext/pcre config.m4 Log: - Renamed config.m4 to config0.m4 # PCRE configure tests must be run before e.g. ext/filter -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date/lib README parse_date.c /ext/date/lib/resource .cvsignore README parse_date.re
sniper Thu Nov 17 04:58:30 2005 EDT
Removed files: (Branch: PHP_5_1)
/php-src/ext/date/lib/resource .cvsignore README parse_date.re
Modified files:
/php-src/ext/date/lib README parse_date.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/ext/date/lib/README?r1=1.4&r2=1.4.2.1&ty=u
Index: php-src/ext/date/lib/README
diff -u php-src/ext/date/lib/README:1.4 php-src/ext/date/lib/README:1.4.2.1
--- php-src/ext/date/lib/README:1.4 Mon Jul 4 03:16:09 2005
+++ php-src/ext/date/lib/README Thu Nov 17 04:58:22 2005
@@ -1,6 +1,6 @@
Regenerating Parser
===
-Make sure you use re2c 0.9.8dev or higher:
+Make sure you use re2c 0.9.10 or higher:
-/dat/dev/sf/re2c/re2c -d -b resource/parse_date.re > parse_date.c
+/dat/dev/sf/re2c/re2c -d -b -o ext/date/parse_date.c ext/date/parse_date.re
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.29.2.8&r2=1.29.2.9&ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.8
php-src/ext/date/lib/parse_date.c:1.29.2.9
--- php-src/ext/date/lib/parse_date.c:1.29.2.8 Wed Oct 19 17:08:21 2005
+++ php-src/ext/date/lib/parse_date.c Thu Nov 17 04:58:22 2005
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.9.10.dev on Wed Oct 19 15:42:32 2005 */
-#line 1 "resource/parse_date.re"
+/* Generated by re2c 0.9.10 on Thu Nov 17 11:55:55 2005 */
+#line 1 "ext/date/lib/parse_date.re"
/*
+--+
| PHP Version 5|
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.29.2.8 2005/10/19 21:08:21 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.9 2005/11/17 09:58:22 sniper Exp $ */
#include "timelib.h"
@@ -695,7 +695,7 @@
std:
s->tok = cursor;
s->len = 0;
-#line 802 "resource/parse_date.re"
+#line 802 "ext/date/lib/parse_date.re"
{
@@ -734,7 +734,7 @@
0, 0, 0, 0, 0, 0, 0, 0,
};
-#line 738 ""
+#line 738 "ext/date/lib/parse_date.c"
{
YYCTYPE yych;
unsigned int yyaccept;
@@ -819,7 +819,7 @@
yy3:
YYDEBUG(3, *YYCURSOR);
-#line 1300 "resource/parse_date.re"
+#line 1300 "ext/date/lib/parse_date.re"
{
int tz_not_found;
DEBUG_OUTPUT("tzcorrection | tz");
@@ -829,7 +829,7 @@
TIMELIB_DEINIT;
return TIMELIB_TIMEZONE;
}
-#line 826 ""
+#line 826 "ext/date/lib/parse_date.c"
yy4:
YYDEBUG(4, *YYCURSOR);
yych = *++YYCURSOR;
@@ -939,13 +939,13 @@
yy8:
YYDEBUG(8, *YYCURSOR);
-#line 1366 "resource/parse_date.re"
+#line 1366 "ext/date/lib/parse_date.re"
{
/* printf("unexpected character: #%d, %c ", *s->tok, *s->tok); */
s->errors++;
goto std;
}
-#line 931 ""
+#line 931 "ext/date/lib/parse_date.c"
yy9:
YYDEBUG(9, *YYCURSOR);
yyaccept = 0;
@@ -1854,11 +1854,11 @@
yy44:
YYDEBUG(44, *YYCURSOR);
-#line 1355 "resource/parse_date.re"
+#line 1355 "ext/date/lib/parse_date.re"
{
goto std;
}
-#line 1767 ""
+#line 1767 "ext/date/lib/parse_date.c"
yy45:
YYDEBUG(45, *YYCURSOR);
++YYCURSOR;
@@ -1866,12 +1866,12 @@
yy46:
YYDEBUG(46, *YYCURSOR);
-#line 1360 "resource/parse_date.re"
+#line 1360 "ext/date/lib/parse_date.re"
{
s->pos = cursor; s->line++;
goto std;
}
-#line 1776 ""
+#line 1776 "ext/date/lib/parse_date.c"
yy47:
YYDEBUG(47, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2329,7 +2329,7 @@
yy85:
YYDEBUG(85, *YYCURSOR);
-#line 1339 "resource/parse_date.re"
+#line 1339 "ext/date/lib/parse_date.re"
{
timelib_ull i;
DEBUG_OUTPUT("relative");
@@ -2344,7 +2344,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2166 ""
+#line 2166 "ext/date/lib/parse_date.c"
yy86:
YYDEBUG(86, *YYCURSOR);
++YYCURSOR;
@@ -3037,12 +3037,12 @@
yy151:
YYDEBUG(151, *YYCURSOR);
-#line 1294 "resource/parse_date.re"
+#line 1294 "ext/date/lib/parse_date.re"
{
DEBUG_OUTPUT("dayabbr");
goto std;
}
-#line 2730 ""
+#line 2730 "ext/date/lib/parse_date.c"
yy152:
YYDEBUG(152, *YYCURSOR);
yyaccept = 1;
@@ -3081,7 +3081,7 @@
yy158:
YYDEBUG(158, *YYCURSOR);
-#line 1277 "resource/parse_date.re"
+#line 1277 "ext/date/lib/parse_date.re"
{
const timelib_relunit* relunit;
DEBUG_OUTPUT("dayfull");
@@ -3097,7 +3097,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2771 ""
+#line 2771 "ext/date/lib/parse_date.c"
yy159:
YYDEBUG(159, *YYCURSOR);
yyaccept = 1;
@@ -3466,7 +3466,7 @@
yy190:
YYDEBUG(190, *YYC
[PHP-CVS] cvs: php-src /ext/date/lib README
sniper Thu Nov 17 04:56:28 2005 EDT Modified files: /php-src/ext/date/lib README Log: fix typo http://cvs.php.net/diff.php/php-src/ext/date/lib/README?r1=1.5&r2=1.6&ty=u Index: php-src/ext/date/lib/README diff -u php-src/ext/date/lib/README:1.5 php-src/ext/date/lib/README:1.6 --- php-src/ext/date/lib/README:1.5 Thu Nov 17 04:52:30 2005 +++ php-src/ext/date/lib/README Thu Nov 17 04:56:28 2005 @@ -3,4 +3,4 @@ Make sure you use re2c 0.9.10 or higher: -/dat/dev/sf/re2c/re2c -d -b -o ext/date/parse_date.c ext/date/parse_date.re +/dat/dev/sf/re2c/re2c -d -b -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib README /ext/date/lib/resource .cvsignore README parse_date.re
sniper Thu Nov 17 04:52:35 2005 EDT Removed files: /php-src/ext/date/lib/resource .cvsignore README parse_date.re Modified files: /php-src/ext/date/lib README Log: - Moved the files from resource to one level down. # This makes the gcov thing actually work :) http://cvs.php.net/diff.php/php-src/ext/date/lib/README?r1=1.4&r2=1.5&ty=u Index: php-src/ext/date/lib/README diff -u php-src/ext/date/lib/README:1.4 php-src/ext/date/lib/README:1.5 --- php-src/ext/date/lib/README:1.4 Mon Jul 4 03:16:09 2005 +++ php-src/ext/date/lib/README Thu Nov 17 04:52:30 2005 @@ -1,6 +1,6 @@ Regenerating Parser === -Make sure you use re2c 0.9.8dev or higher: +Make sure you use re2c 0.9.10 or higher: -/dat/dev/sf/re2c/re2c -d -b resource/parse_date.re > parse_date.c +/dat/dev/sf/re2c/re2c -d -b -o ext/date/parse_date.c ext/date/parse_date.re -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/cli php_cli.c php_cli_readline.c
sniper Thu Nov 17 03:37:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cli php_cli.c php_cli_readline.c
Log:
MFH: - Fix compile failure when ext/readline is compiled as shared (bug
#35249)
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.129.2.5&r2=1.129.2.6&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.5
php-src/sapi/cli/php_cli.c:1.129.2.6
--- php-src/sapi/cli/php_cli.c:1.129.2.5Tue Nov 15 10:27:26 2005
+++ php-src/sapi/cli/php_cli.c Thu Nov 17 03:37:31 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.5 2005/11/15 15:27:26 iliaa Exp $ */
+/* $Id: php_cli.c,v 1.129.2.6 2005/11/17 08:37:31 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -70,11 +70,12 @@
#include
#endif
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
#include
#if !HAVE_LIBEDIT
#include
#endif
+#include "php_cli_readline.h"
#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
#include "zend_compile.h"
@@ -82,9 +83,7 @@
#include "zend_highlight.h"
#include "zend_indent.h"
-
#include "php_getopt.h"
-#include "php_cli_readline.h"
#ifndef O_BINARY
#define O_BINARY 0
@@ -100,7 +99,7 @@
static char *php_optarg = NULL;
static int php_optind = 1;
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
static char php_last_char = '\0';
#endif
@@ -212,7 +211,7 @@
uint remaining = str_length;
size_t ret;
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
if (!str_length) {
return 0;
}
@@ -390,7 +389,7 @@
" %s [options] -- [args...]\n"
" %s [options] -a\n"
"\n"
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
" -a Run as interactive shell\n"
#else
" -a Run interactively\n"
@@ -977,7 +976,7 @@
cli_register_file_handles(TSRMLS_C);
}
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
if (interactive) {
char *line;
size_t size = 4096, pos = 0, len;
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.3.2.2&r2=1.3.2.3&ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.3.2.2
php-src/sapi/cli/php_cli_readline.c:1.3.2.3
--- php-src/sapi/cli/php_cli_readline.c:1.3.2.2 Mon Nov 7 14:14:40 2005
+++ php-src/sapi/cli/php_cli_readline.c Thu Nov 17 03:37:31 2005
@@ -17,9 +17,12 @@
+--+
*/
-/* $Id: php_cli_readline.c,v 1.3.2.2 2005/11/07 19:14:40 helly Exp $ */
+/* $Id: php_cli_readline.c,v 1.3.2.3 2005/11/17 08:37:31 sniper Exp $ */
#include "php.h"
+
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
+
#include "php_globals.h"
#include "php_variables.h"
#include "zend_hash.h"
@@ -42,20 +45,16 @@
#include
#endif
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
#include
#if !HAVE_LIBEDIT
#include
#endif
-#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
#include "zend_compile.h"
#include "zend_execute.h"
#include "zend_highlight.h"
#include "zend_indent.h"
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
-
/* {{{ cli_is_valid_code
*/
typedef enum {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c php_cli_readline.c
sniper Thu Nov 17 03:36:14 2005 EDT
Modified files:
/php-src/sapi/cli php_cli.c php_cli_readline.c
Log:
- Fix compile failure when ext/readline is compiled as shared
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.136&r2=1.137&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.136 php-src/sapi/cli/php_cli.c:1.137
--- php-src/sapi/cli/php_cli.c:1.136Tue Nov 15 10:30:41 2005
+++ php-src/sapi/cli/php_cli.c Thu Nov 17 03:36:11 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.136 2005/11/15 15:30:41 iliaa Exp $ */
+/* $Id: php_cli.c,v 1.137 2005/11/17 08:36:11 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -72,11 +72,12 @@
#include
#endif
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
#include
#if !HAVE_LIBEDIT
#include
#endif
+#include "php_cli_readline.h"
#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
#include "zend_compile.h"
@@ -84,9 +85,7 @@
#include "zend_highlight.h"
#include "zend_indent.h"
-
#include "php_getopt.h"
-#include "php_cli_readline.h"
#ifndef O_BINARY
#define O_BINARY 0
@@ -104,7 +103,7 @@
static char *php_optarg = NULL;
static int php_optind = 1;
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
static char php_last_char = '\0';
#endif
@@ -218,7 +217,7 @@
uint remaining = str_length;
size_t ret;
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
if (!str_length) {
return 0;
}
@@ -396,7 +395,7 @@
" %s [options] -- [args...]\n"
" %s [options] -a\n"
"\n"
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
" -a Run as interactive shell\n"
#else
" -a Run interactively\n"
@@ -1002,7 +1001,7 @@
cli_register_file_handles(TSRMLS_C);
}
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
if (interactive) {
char *line;
size_t size = 4096, pos = 0, len;
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli_readline.c?r1=1.5&r2=1.6&ty=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.5
php-src/sapi/cli/php_cli_readline.c:1.6
--- php-src/sapi/cli/php_cli_readline.c:1.5 Mon Nov 7 14:12:37 2005
+++ php-src/sapi/cli/php_cli_readline.c Thu Nov 17 03:36:12 2005
@@ -17,9 +17,12 @@
+--+
*/
-/* $Id: php_cli_readline.c,v 1.5 2005/11/07 19:12:37 helly Exp $ */
+/* $Id: php_cli_readline.c,v 1.6 2005/11/17 08:36:12 sniper Exp $ */
#include "php.h"
+
+#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
+
#include "php_globals.h"
#include "php_variables.h"
#include "zend_hash.h"
@@ -42,20 +45,16 @@
#include
#endif
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
#include
#if !HAVE_LIBEDIT
#include
#endif
-#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
#include "zend_compile.h"
#include "zend_execute.h"
#include "zend_highlight.h"
#include "zend_indent.h"
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
-
/* {{{ cli_is_valid_code
*/
typedef enum {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
