[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Oct 14 01:44:33 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2131r2=1.2132ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2131 php-src/ChangeLog:1.2132 --- php-src/ChangeLog:1.2131Thu Oct 13 01:39:52 2005 +++ php-src/ChangeLog Fri Oct 14 01:44:17 2005 @@ -1,3 +1,83 @@ +2005-10-13 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/mysqli/tests/bug33491.phpt: + Fixed test failure + +2005-10-13 Rob Richards [EMAIL PROTECTED] + +* acinclude.m4: + bump libxml min version to 2.6.11 + +2005-10-13 Jani Taskinen [EMAIL PROTECTED] + +* ext/iconv/config.m4: + proper quoting, breaking, etc. + +2005-10-13 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS + NEWS + ext/iconv/config.m4 + ext/iconv/config.m4: + MFH: fix #34856 (configure fails to detect libiconv's type) + +* ext/iconv/config.m4: + correct it one more time (grrr) + +* ext/iconv/config.m4: + correct the fix + +* ext/iconv/config.m4: + fix #34856 (configure fails to detect libiconv's type) + +* (PHP_5_0) + NEWS + NEWS + ext/interbase/ibase_service.c + ext/interbase/ibase_service.c: + MFH: fix #34855 (ibase_service_attach() segfault on AMD64) + +* ext/interbase/ibase_service.c: + fix #34855 (ibase_service_attach() segfault on AMD64) + +2005-10-13 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + sapi/cli/Makefile.frag + scripts/Makefile.frag: + MFH: - Fixed bug #34850 (--program-suffix and --program-prefix not included + in man page names) + +* sapi/cli/Makefile.frag + scripts/Makefile.frag: + MF51:- Fixed bug #34850 (--program-suffix and --program-prefix not included + in man page names) + +* (PHP_5_1) + NEWS + sapi/cli/Makefile.frag + scripts/Makefile.frag: + - Fixed bug #34850 (--program-suffix and --program-prefix not included in + man page names) + +* (PHP_5_1) + NEWS: + reorder + +2005-10-13 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_1) + ZendEngine2/zend_API.c: + ws fix + +2005-10-13 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + Zend/zend_execute.c: + - This is an integer in PHP 4, and not a zval* like in PHP 5.0. + 2005-10-12 Marcus Boerger [EMAIL PROTECTED] * ext/pcre/php_pcre.c @@ -13837,7 +13917,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2131 2005/10/13 05:39:52 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2132 2005/10/14 05:44:17 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -17238,7 +17318,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2131 2005/10/13 05:39:52 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2132 2005/10/14 05:44:17 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -17719,7 +17799,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2131 2005/10/13 05:39:52 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2132 2005/10/14 05:44:17 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -19193,7 +19273,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2131 2005/10/13 05:39:52 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2132 2005/10/14 05:44:17 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
Re: [PHP-CVS] cvs: php-src / NEWS /sapi/apache2handler sapi_apache2.c
Rasmus, you forgot to MFB it to 5.0.
Or it was done intentionally?
On 26.07.2005 02:38, Rasmus Lerdorf wrote:
rasmus Mon Jul 25 18:38:11 2005 EDT
Modified files:
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFB fix for bug #33690
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2006r2=1.2007ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2006 php-src/NEWS:1.2007
--- php-src/NEWS:1.2006 Sat Jul 23 19:34:02 2005
+++ php-src/NEWSMon Jul 25 18:38:10 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2005, PHP 5.1
+- Fixed bug #33690 (Crash setting some ini directives in httpd.conf). (Rasmus)
- Fixed bug #33841 (pdo sqlite driver forgets to update affected column count
on execution of prepared statments).
- Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.55r2=1.56ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.55
php-src/sapi/apache2handler/sapi_apache2.c:1.56
--- php-src/sapi/apache2handler/sapi_apache2.c:1.55 Mon Jun 20 08:46:34 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jul 25 18:38:11 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.55 2005/06/20 12:46:34 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.56 2005/07/25 22:38:11 rasmus Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -454,6 +454,21 @@
TSRMLS_FETCH();
conf = ap_get_module_config(r-per_dir_config, php5_module);
+
+ /* apply_config() needs r in some cases, so allocate server_context
early */
+ ctx = SG(server_context);
+ if (ctx == NULL) {
+ ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
+ /* register a cleanup so we clear out the SG(server_context)
+* after each request. Note: We pass in the pointer to the
+* server_context in case this is handled by a different thread.
+*/
+ apr_pool_cleanup_register(r-pool, (void *)SG(server_context),
php_server_context_cleanup, apr_pool_cleanup_null);
+ ctx-r = r;
+ ctx = NULL; /* May look weird to null it here, but it is to
catch the right case in the first_try later on */
+ } else {
+ ctx-r = r;
+ }
apply_config(conf);
if (strcmp(r-handler, PHP_MAGIC_TYPE) strcmp(r-handler, PHP_SOURCE_MAGIC_TYPE) strcmp(r-handler, PHP_SCRIPT)) {
@@ -511,17 +526,9 @@
zend_first_try {
- ctx = SG(server_context);
if (ctx == NULL) {
- ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
- /* register a cleanup so we clear out the SG(server_context)
-* after each request. Note: We pass in the pointer to the
-* server_context in case this is handled by a different thread.
-*/
- apr_pool_cleanup_register(r-pool, (void *)SG(server_context),
php_server_context_cleanup, apr_pool_cleanup_null);
-
- ctx-r = r;
brigade = apr_brigade_create(r-pool,
r-connection-bucket_alloc);
+ ctx = SG(server_context);
ctx-brigade = brigade;
if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
--
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(PHP_5_1) / NEWS
sniper Thu Oct 13 06:02:02 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: reorder http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.122r2=1.2027.2.123ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.122 php-src/NEWS:1.2027.2.123 --- php-src/NEWS:1.2027.2.122 Wed Oct 12 17:23:48 2005 +++ php-src/NEWSThu Oct 13 06:01:59 2005 @@ -5,9 +5,6 @@ (Edin) - Changed instanceof and catch operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) -- Added support for class constants and static members for internal classes. - (Dmitry, Michael Wallner) -- Added new_link parameter to mssql_connect() (Bug #34369). (Frank) - Improved SPL extension. (Marcus) . Moved RecursiveArrayIterator from examples into extension . Moved RecursiveFilterIterator from examples into extension @@ -30,6 +27,9 @@ . ext/oracle (Jani, Derick) . ext/ovrimos (Jani, Derick, Pierre) . ext/pfpro (Jani, Derick, Pierre) +- Added support for class constants and static members for internal classes. + (Dmitry, Michael Wallner) +- Added new_link parameter to mssql_connect() (Bug #34369). (Frank) - Added missing safe_mode checks for image* functions and cURL. (Ilia) - Added missing safe_mode/open_basedir checks for file uploads. (Ilia) - Fixed possible INI setting leak via virtual() in Apache 2 sapi. (Ilia) -- 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/cli Makefile.frag /scripts Makefile.frag
sniper Thu Oct 13 06:02:59 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/sapi/cli Makefile.frag
/php-src/scriptsMakefile.frag
Log:
- Fixed bug #34850 (--program-suffix and --program-prefix not included in man
page names)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.123r2=1.2027.2.124ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.123 php-src/NEWS:1.2027.2.124
--- php-src/NEWS:1.2027.2.123 Thu Oct 13 06:01:59 2005
+++ php-src/NEWSThu Oct 13 06:02:58 2005
@@ -43,6 +43,8 @@
- Fixed make test to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34850 (--program-suffix and --program-prefix not included in
+ man page names). (Jani)
- Fixed bug #34818 (several functions crash when invalid mysqli_link object
is passed). (Tony)
- Fixed bug #34810 (mysqli::init() and others use wrong $this pointer
http://cvs.php.net/diff.php/php-src/sapi/cli/Makefile.frag?r1=1.4r2=1.4.4.1ty=u
Index: php-src/sapi/cli/Makefile.frag
diff -u php-src/sapi/cli/Makefile.frag:1.4
php-src/sapi/cli/Makefile.frag:1.4.4.1
--- php-src/sapi/cli/Makefile.frag:1.4 Tue Sep 2 17:41:01 2003
+++ php-src/sapi/cli/Makefile.frag Thu Oct 13 06:02:59 2005
@@ -8,4 +8,4 @@
@$(INSTALL_CLI)
@echo Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/php.1
+ @$(INSTALL_DATA) $(builddir)/php.1
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.24.2.1r2=1.24.2.2ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.24.2.1
php-src/scripts/Makefile.frag:1.24.2.2
--- php-src/scripts/Makefile.frag:1.24.2.1 Wed Aug 31 03:00:22 2005
+++ php-src/scripts/Makefile.frag Thu Oct 13 06:02:59 2005
@@ -22,7 +22,7 @@
config.sub
bin_SCRIPTS = phpize php-config
-man_PAGES = phpize.1 php-config.1
+man_PAGES = phpize php-config
install-build:
@echo Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/
@@ -53,14 +53,14 @@
install-programs: $(builddir)/phpize $(builddir)/php-config
@echo Installing helper programs: $(INSTALL_ROOT)$(bindir)/
@for prog in $(bin_SCRIPTS); do \
- echo program: $(program_prefix)$$prog$(program_suffix); \
- $(INSTALL) -m 755 $(builddir)/$$prog
$(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \
+ echo program: $(program_prefix)$${prog}$(program_suffix); \
+ $(INSTALL) -m 755 $(builddir)/$${prog}
$(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
done
@echo Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@for page in $(man_PAGES); do \
- echo page: $$page; \
- $(INSTALL_DATA) $(builddir)/man1/$$page
$(INSTALL_ROOT)$(mandir)/man1/$$page; \
+ echo page: $(program_prefix)$${page}$(program_suffix).1; \
+ $(INSTALL_DATA) $(builddir)/man1/$${page}.1
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
done
$(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli Makefile.frag /scripts Makefile.frag
sniper Thu Oct 13 06:04:17 2005 EDT
Modified files:
/php-src/sapi/cli Makefile.frag
/php-src/scriptsMakefile.frag
Log:
MF51:- Fixed bug #34850 (--program-suffix and --program-prefix not included
in man page names)
http://cvs.php.net/diff.php/php-src/sapi/cli/Makefile.frag?r1=1.4r2=1.5ty=u
Index: php-src/sapi/cli/Makefile.frag
diff -u php-src/sapi/cli/Makefile.frag:1.4 php-src/sapi/cli/Makefile.frag:1.5
--- php-src/sapi/cli/Makefile.frag:1.4 Tue Sep 2 17:41:01 2003
+++ php-src/sapi/cli/Makefile.frag Thu Oct 13 06:04:16 2005
@@ -8,4 +8,4 @@
@$(INSTALL_CLI)
@echo Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/php.1
+ @$(INSTALL_DATA) $(builddir)/php.1
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.25r2=1.26ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.25 php-src/scripts/Makefile.frag:1.26
--- php-src/scripts/Makefile.frag:1.25 Wed Aug 31 02:58:25 2005
+++ php-src/scripts/Makefile.frag Thu Oct 13 06:04:17 2005
@@ -22,7 +22,7 @@
config.sub
bin_SCRIPTS = phpize php-config
-man_PAGES = phpize.1 php-config.1
+man_PAGES = phpize php-config
install-build:
@echo Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/
@@ -53,14 +53,14 @@
install-programs: $(builddir)/phpize $(builddir)/php-config
@echo Installing helper programs: $(INSTALL_ROOT)$(bindir)/
@for prog in $(bin_SCRIPTS); do \
- echo program: $(program_prefix)$$prog$(program_suffix); \
- $(INSTALL) -m 755 $(builddir)/$$prog
$(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \
+ echo program: $(program_prefix)$${prog}$(program_suffix); \
+ $(INSTALL) -m 755 $(builddir)/$${prog}
$(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
done
@echo Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@for page in $(man_PAGES); do \
- echo page: $$page; \
- $(INSTALL_DATA) $(builddir)/man1/$$page
$(INSTALL_ROOT)$(mandir)/man1/$$page; \
+ echo page: $(program_prefix)$${page}$(program_suffix).1; \
+ $(INSTALL_DATA) $(builddir)/man1/$${page}.1
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
done
$(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
--
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 /sapi/cli Makefile.frag /scripts Makefile.frag
sniper Thu Oct 13 06:04:53 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/sapi/cli Makefile.frag
/php-src/scriptsMakefile.frag
Log:
MFH: - Fixed bug #34850 (--program-suffix and --program-prefix not included
in man page names)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.56r2=1.1247.2.920.2.57ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.56 php-src/NEWS:1.1247.2.920.2.57
--- php-src/NEWS:1.1247.2.920.2.56 Wed Oct 12 07:08:40 2005
+++ php-src/NEWSThu Oct 13 06:04:51 2005
@@ -2,6 +2,8 @@
|||
?? Oct 2005, Version 4.4.1
- Fixed a memory corruption bug regarding included files. (Derick)
+- Fixed bug #34850 (--program-suffix and --program-prefix not included in
+ man page names). (Jani)
- Fixed bug #34790 (preg_match_all(), named capturing groups, variable
assignment/return = crash). (Dmitry)
- Fixed bug #34742 (ftp wrapper failures caused from segmented command
http://cvs.php.net/diff.php/php-src/sapi/cli/Makefile.frag?r1=1.1.2.2r2=1.1.2.2.8.1ty=u
Index: php-src/sapi/cli/Makefile.frag
diff -u php-src/sapi/cli/Makefile.frag:1.1.2.2
php-src/sapi/cli/Makefile.frag:1.1.2.2.8.1
--- php-src/sapi/cli/Makefile.frag:1.1.2.2 Tue Feb 11 23:39:30 2003
+++ php-src/sapi/cli/Makefile.frag Thu Oct 13 06:04:53 2005
@@ -6,4 +6,4 @@
@$(INSTALL_CLI)
@echo Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
- @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/php.1
+ @$(INSTALL_DATA) $(builddir)/php.1
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.1.2.11.2.4r2=1.1.2.11.2.5ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.1.2.11.2.4
php-src/scripts/Makefile.frag:1.1.2.11.2.5
--- php-src/scripts/Makefile.frag:1.1.2.11.2.4 Wed Jun 8 06:34:41 2005
+++ php-src/scripts/Makefile.frag Thu Oct 13 06:04:53 2005
@@ -21,7 +21,7 @@
config.sub
bin_SCRIPTS = phpize php-config
-man_PAGES = phpize.1 php-config.1
+man_PAGES = phpize php-config
install-build:
@echo Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/
@@ -69,14 +69,14 @@
install-programs: $(builddir)/phpize $(builddir)/php-config
@echo Installing helper programs: $(INSTALL_ROOT)$(bindir)/
@for prog in $(bin_SCRIPTS); do \
- echo program: $(program_prefix)$$prog$(program_suffix); \
- $(INSTALL) -m 755 $(builddir)/$$prog
$(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \
+ echo program: $(program_prefix)$${prog}$(program_suffix); \
+ $(INSTALL) -m 755 $(builddir)/$${prog}
$(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
done
@echo Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@for page in $(man_PAGES); do \
- echo page: $$page; \
- $(INSTALL_DATA) $(builddir)/man1/$$page
$(INSTALL_ROOT)$(mandir)/man1/$$page; \
+ echo page: $(program_prefix)$${page}$(program_suffix).1; \
+ $(INSTALL_DATA) $(builddir)/man1/$${page}.1
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
done
$(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /sapi/apache2handler sapi_apache2.c
PHP_5_0 branch is dead as far as most of use are concerned.
We're about to release 5.1, not 5.0.x.
--Jani
On Thu, 13 Oct 2005, Antony Dovgal wrote:
Rasmus, you forgot to MFB it to 5.0.
Or it was done intentionally?
On 26.07.2005 02:38, Rasmus Lerdorf wrote:
rasmus Mon Jul 25 18:38:11 2005 EDT
Modified files: /php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c Log:
MFB fix for bug #33690
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2006r2=1.2007ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2006 php-src/NEWS:1.2007
--- php-src/NEWS:1.2006 Sat Jul 23 19:34:02 2005
+++ php-src/NEWSMon Jul 25 18:38:10 2005
@@ -1,6 +1,7 @@
PHP
NEWS
|||
?? ??? 2005, PHP 5.1
+- Fixed bug #33690 (Crash setting some ini directives in httpd.conf).
(Rasmus)
- Fixed bug #33841 (pdo sqlite driver forgets to update affected column
count
on execution of prepared statments).
- Fixed bug #33802 (throw Exception in error handler causes crash).
(Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.55r2=1.56ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.55
php-src/sapi/apache2handler/sapi_apache2.c:1.56
--- php-src/sapi/apache2handler/sapi_apache2.c:1.55 Mon Jun 20 08:46:34
2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jul 25 18:38:11
2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.55 2005/06/20 12:46:34 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.56 2005/07/25 22:38:11 rasmus Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -454,6 +454,21 @@
TSRMLS_FETCH();
conf = ap_get_module_config(r-per_dir_config, php5_module);
+
+ /* apply_config() needs r in some cases, so allocate server_context
early */
+ ctx = SG(server_context);
+ if (ctx == NULL) {
+ ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
+ /* register a cleanup so we clear out the SG(server_context)
+* after each request. Note: We pass in the pointer to the
+ * server_context in case this is handled by a different
thread.
+*/
+ apr_pool_cleanup_register(r-pool, (void
*)SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null);
+ ctx-r = r;
+ ctx = NULL; /* May look weird to null it here, but it is to
catch the right case in the first_try later on */
+ } else {
+ ctx-r = r;
+ }
apply_config(conf);
if (strcmp(r-handler, PHP_MAGIC_TYPE) strcmp(r-handler,
PHP_SOURCE_MAGIC_TYPE) strcmp(r-handler, PHP_SCRIPT)) {
@@ -511,17 +526,9 @@
zend_first_try {
- ctx = SG(server_context);
if (ctx == NULL) {
- ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
- /* register a cleanup so we clear out the SG(server_context)
-* after each request. Note: We pass in the pointer to the
- * server_context in case this is handled by a different
thread.
-*/
- apr_pool_cleanup_register(r-pool, (void
*)SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null);
-
- ctx-r = r;
brigade = apr_brigade_create(r-pool,
r-connection-bucket_alloc);
+ ctx = SG(server_context);
ctx-brigade = brigade;
if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
--
Give me your money at @ http://pecl.php.net/wishlist.php/sniper
Donating money may make me happier and friendlier for a limited period!
Death to all 4 letter abbreviations starting with P!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /sapi/apache2handler sapi_apache2.c
On 13.10.2005 14:14, Jani Taskinen wrote: PHP_5_0 branch is dead as far as most of use are concerned. We're about to release 5.1, not 5.0.x. I know that we're about to release 5.1, but up to that moment I'd like to see all the patches for HEAD MFH'ed to 5.0 too. Btw, in July HEAD was equal to 5.1, so I don't see any reason why it was not MFH'ed. -- 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 / NEWS /sapi/apache2handler sapi_apache2.c
On Thu, 13 Oct 2005, Antony Dovgal wrote: On 13.10.2005 14:14, Jani Taskinen wrote: PHP_5_0 branch is dead as far as most of use are concerned. We're about to release 5.1, not 5.0.x. I know that we're about to release 5.1, but up to that moment I'd like to see all the patches for HEAD MFH'ed to 5.0 too. Feel free to backport them ofcourse... Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase ibase_service.c
tony2001Thu Oct 13 08:58:22 2005 EDT
Modified files:
/php-src/ext/interbase ibase_service.c
Log:
fix #34855 (ibase_service_attach() segfault on AMD64)
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_service.c?r1=1.11r2=1.12ty=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.11
php-src/ext/interbase/ibase_service.c:1.12
--- php-src/ext/interbase/ibase_service.c:1.11 Wed Aug 3 10:07:19 2005
+++ php-src/ext/interbase/ibase_service.c Thu Oct 13 08:58:22 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ibase_service.c,v 1.11 2005/08/03 14:07:19 sniper Exp $ */
+/* $Id: ibase_service.c,v 1.12 2005/10/13 12:58:22 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -210,7 +210,7 @@
Connect to the service manager */
PHP_FUNCTION(ibase_service_attach)
{
- long hlen, ulen, plen, spb_len;
+ int hlen, ulen, plen, spb_len;
ibase_service *svm;
char buf[128], *host, *user, *pass, *loc;
isc_svc_handle handle = NULL;
--
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/interbase ibase_service.c
tony2001Thu Oct 13 08:58:48 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/interbase ibase_service.c
Log:
MFH: fix #34855 (ibase_service_attach() segfault on AMD64)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.124r2=1.2027.2.125ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.124 php-src/NEWS:1.2027.2.125
--- php-src/NEWS:1.2027.2.124 Thu Oct 13 06:02:58 2005
+++ php-src/NEWSThu Oct 13 08:58:42 2005
@@ -43,6 +43,8 @@
- Fixed make test to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34855 (ibase_service_attach() segfault on AMD64).
+ (irie at gmx dot de, Tony)
- Fixed bug #34850 (--program-suffix and --program-prefix not included in
man page names). (Jani)
- Fixed bug #34818 (several functions crash when invalid mysqli_link object
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_service.c?r1=1.11r2=1.11.2.1ty=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.11
php-src/ext/interbase/ibase_service.c:1.11.2.1
--- php-src/ext/interbase/ibase_service.c:1.11 Wed Aug 3 10:07:19 2005
+++ php-src/ext/interbase/ibase_service.c Thu Oct 13 08:58:48 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ibase_service.c,v 1.11 2005/08/03 14:07:19 sniper Exp $ */
+/* $Id: ibase_service.c,v 1.11.2.1 2005/10/13 12:58:48 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -210,7 +210,7 @@
Connect to the service manager */
PHP_FUNCTION(ibase_service_attach)
{
- long hlen, ulen, plen, spb_len;
+ int hlen, ulen, plen, spb_len;
ibase_service *svm;
char buf[128], *host, *user, *pass, *loc;
isc_svc_handle handle = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv config.m4
tony2001Thu Oct 13 11:13:31 2005 EDT Modified files: /php-src/ext/iconv config.m4 Log: fix #34856 (configure fails to detect libiconv's type) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.33r2=1.34ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.33 php-src/ext/iconv/config.m4:1.34 --- php-src/ext/iconv/config.m4:1.33Sun Jun 19 20:52:56 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:13:29 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.33 2005/06/20 00:52:56 sniper Exp $ +dnl $Id: config.m4,v 1.34 2005/10/13 15:13:29 tony2001 Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -18,6 +18,16 @@ iconv_ldflags_save=$LDFLAGS if test -z $ICONV_DIR; then + for i in /usr /usr/local; do +if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + PHP_ICONV_PREFIX=$i +fi + done +if test -z $PHP_ICONV_PREFIX; then + PHP_ICONV_PREFIX=/usr +fi + +if test -z $ICONV_DIR; then PHP_ICONV_PREFIX=/usr else PHP_ICONV_PREFIX=$ICONV_DIR -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv config.m4
tony2001Thu Oct 13 11:18:38 2005 EDT Modified files: /php-src/ext/iconv config.m4 Log: correct the fix http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.34r2=1.35ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.34 php-src/ext/iconv/config.m4:1.35 --- php-src/ext/iconv/config.m4:1.34Thu Oct 13 11:13:29 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:18:37 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.34 2005/10/13 15:13:29 tony2001 Exp $ +dnl $Id: config.m4,v 1.35 2005/10/13 15:18:37 tony2001 Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -23,8 +23,9 @@ PHP_ICONV_PREFIX=$i fi done -if test -z $PHP_ICONV_PREFIX; then - PHP_ICONV_PREFIX=/usr + if test -z $PHP_ICONV_PREFIX; then +PHP_ICONV_PREFIX=/usr + fi fi if test -z $ICONV_DIR; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv config.m4
tony2001Thu Oct 13 11:22:22 2005 EDT Modified files: /php-src/ext/iconv config.m4 Log: correct it one more time (grrr) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.35r2=1.36ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.35 php-src/ext/iconv/config.m4:1.36 --- php-src/ext/iconv/config.m4:1.35Thu Oct 13 11:18:37 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:22:20 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.35 2005/10/13 15:18:37 tony2001 Exp $ +dnl $Id: config.m4,v 1.36 2005/10/13 15:22:20 tony2001 Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -26,10 +26,6 @@ if test -z $PHP_ICONV_PREFIX; then PHP_ICONV_PREFIX=/usr fi -fi - -if test -z $ICONV_DIR; then - PHP_ICONV_PREFIX=/usr else PHP_ICONV_PREFIX=$ICONV_DIR fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/iconv config.m4
tony2001Thu Oct 13 11:23:16 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/iconv config.m4 /php-srcNEWS Log: MFH: fix #34856 (configure fails to detect libiconv's type) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.33r2=1.33.2.1ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.33 php-src/ext/iconv/config.m4:1.33.2.1 --- php-src/ext/iconv/config.m4:1.33Sun Jun 19 20:52:56 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:23:11 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.33 2005/06/20 00:52:56 sniper Exp $ +dnl $Id: config.m4,v 1.33.2.1 2005/10/13 15:23:11 tony2001 Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -18,7 +18,14 @@ iconv_ldflags_save=$LDFLAGS if test -z $ICONV_DIR; then - PHP_ICONV_PREFIX=/usr + for i in /usr /usr/local; do +if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + PHP_ICONV_PREFIX=$i +fi + done + if test -z $PHP_ICONV_PREFIX; then +PHP_ICONV_PREFIX=/usr + fi else PHP_ICONV_PREFIX=$ICONV_DIR fi http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.125r2=1.2027.2.126ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.125 php-src/NEWS:1.2027.2.126 --- php-src/NEWS:1.2027.2.125 Thu Oct 13 08:58:42 2005 +++ php-src/NEWSThu Oct 13 11:23:11 2005 @@ -43,6 +43,7 @@ - Fixed make test to work for phpized extensions. (Hartmut, Jani) - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems. (Andrey) +- Fixed bug #34856 (configure fails to detect libiconv's type). (Tony) - Fixed bug #34855 (ibase_service_attach() segfault on AMD64). (irie at gmx dot de, Tony) - Fixed bug #34850 (--program-suffix and --program-prefix not included in -- 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 /ext/iconv config.m4
tony2001Thu Oct 13 11:24:26 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/iconv config.m4 /php-srcNEWS Log: MFH: fix #34856 (configure fails to detect libiconv's type) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.27.2.2r2=1.27.2.3ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.27.2.2 php-src/ext/iconv/config.m4:1.27.2.3 --- php-src/ext/iconv/config.m4:1.27.2.2Mon Jan 10 16:37:59 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:24:25 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27.2.2 2005/01/10 21:37:59 tony2001 Exp $ +dnl $Id: config.m4,v 1.27.2.3 2005/10/13 15:24:25 tony2001 Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -18,7 +18,14 @@ iconv_ldflags_save=$LDFLAGS if test -z $ICONV_DIR; then - PHP_ICONV_PREFIX=/usr + for i in /usr /usr/local; do +if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + PHP_ICONV_PREFIX=$i +fi + done + if test -z $PHP_ICONV_PREFIX; then +PHP_ICONV_PREFIX=/usr + fi else PHP_ICONV_PREFIX=$ICONV_DIR fi http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.499r2=1.1760.2.500ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.499 php-src/NEWS:1.1760.2.500 --- php-src/NEWS:1.1760.2.499 Thu Oct 13 08:59:12 2005 +++ php-src/NEWSThu Oct 13 11:24:25 2005 @@ -2,6 +2,7 @@ ||| ?? ??? , PHP 5.0.6 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #34856 (configure fails to detect libiconv's type). (Tony) - Fixed bug #34855 (ibase_service_attach() segfault on AMD64). (irie at gmx dot de, Tony) - Fixed bug #34810 (mysqli::init() and others use wrong $this pointer -- 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/pdo/tests pdo_014.phpt
helly Thu Oct 13 14:37:23 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo/tests pdo_014.phpt
Log:
- Do not try to autoload the class, use internal only
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_014.phpt?r1=1.4.2.3r2=1.4.2.4ty=u
Index: php-src/ext/pdo/tests/pdo_014.phpt
diff -u php-src/ext/pdo/tests/pdo_014.phpt:1.4.2.3
php-src/ext/pdo/tests/pdo_014.phpt:1.4.2.4
--- php-src/ext/pdo/tests/pdo_014.phpt:1.4.2.3 Mon Oct 3 11:06:27 2005
+++ php-src/ext/pdo/tests/pdo_014.phpt Thu Oct 13 14:37:19 2005
@@ -4,7 +4,7 @@
?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) print 'skip SPL not available';
-if (!class_exists('IteratorIterator')) die('skip IteratorIterator class not
present');
+if (!class_exists('IteratorIterator', false)) die('skip IteratorIterator class
not present');
$dir = getenv('REDIR_TEST_DIR');
if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv config.m4
sniper Thu Oct 13 15:28:50 2005 EDT Modified files: /php-src/ext/iconv config.m4 Log: proper quoting, breaking, etc. http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.36r2=1.37ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.36 php-src/ext/iconv/config.m4:1.37 --- php-src/ext/iconv/config.m4:1.36Thu Oct 13 11:22:20 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 15:28:47 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.36 2005/10/13 15:22:20 tony2001 Exp $ +dnl $Id: config.m4,v 1.37 2005/10/13 19:28:47 sniper Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -18,9 +18,10 @@ iconv_ldflags_save=$LDFLAGS if test -z $ICONV_DIR; then - for i in /usr /usr/local; do -if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + for i in /usr/local /usr; do +if test -f $i/include/iconv.h || test -f $i/include/giconv.h; then PHP_ICONV_PREFIX=$i + break fi done if test -z $PHP_ICONV_PREFIX; then @@ -33,7 +34,7 @@ CFLAGS=-I$PHP_ICONV_PREFIX/include $CFLAGS LDFLAGS=-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS -if test -r $PHP_ICONV_PREFIX/include/giconv.h; then +if test -r $PHP_ICONV_PREFIX/include/giconv.h; then PHP_ICONV_H_PATH=$PHP_ICONV_PREFIX/include/giconv.h else PHP_ICONV_H_PATH=$PHP_ICONV_PREFIX/include/iconv.h -- 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/iconv config.m4
sniper Thu Oct 13 15:28:59 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/iconv config.m4 Log: MFH http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.33.2.1r2=1.33.2.2ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.33.2.1 php-src/ext/iconv/config.m4:1.33.2.2 --- php-src/ext/iconv/config.m4:1.33.2.1Thu Oct 13 11:23:11 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 15:28:58 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.33.2.1 2005/10/13 15:23:11 tony2001 Exp $ +dnl $Id: config.m4,v 1.33.2.2 2005/10/13 19:28:58 sniper Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -18,9 +18,10 @@ iconv_ldflags_save=$LDFLAGS if test -z $ICONV_DIR; then - for i in /usr /usr/local; do -if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + for i in /usr/local /usr; do +if test -f $i/include/iconv.h || test -f $i/include/giconv.h; then PHP_ICONV_PREFIX=$i + break fi done if test -z $PHP_ICONV_PREFIX; then @@ -33,7 +34,7 @@ CFLAGS=-I$PHP_ICONV_PREFIX/include $CFLAGS LDFLAGS=-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS -if test -r $PHP_ICONV_PREFIX/include/giconv.h; then +if test -r $PHP_ICONV_PREFIX/include/giconv.h; then PHP_ICONV_H_PATH=$PHP_ICONV_PREFIX/include/giconv.h else PHP_ICONV_H_PATH=$PHP_ICONV_PREFIX/include/iconv.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/examples recursivetreeiterator.inc
helly Thu Oct 13 15:45:35 2005 EDT
Modified files:
/php-src/ext/spl/examples recursivetreeiterator.inc
Log:
- Add ability to bypass key() surrounding and make that default
http://cvs.php.net/diff.php/php-src/ext/spl/examples/recursivetreeiterator.inc?r1=1.5r2=1.6ty=u
Index: php-src/ext/spl/examples/recursivetreeiterator.inc
diff -u php-src/ext/spl/examples/recursivetreeiterator.inc:1.5
php-src/ext/spl/examples/recursivetreeiterator.inc:1.6
--- php-src/ext/spl/examples/recursivetreeiterator.inc:1.5 Sat Oct 8
14:57:16 2005
+++ php-src/ext/spl/examples/recursivetreeiterator.inc Thu Oct 13 15:45:29 2005
@@ -19,6 +19,7 @@
class RecursiveTreeIterator extends RecursiveIteratorIterator
{
const BYPASS_CURRENT = 0x0004;
+ const BYPASS_KEY = 0x0008;
private $rit_flags;
@@ -28,7 +29,7 @@
* @param cit_flags flags passed to RecursiveCachingIterator (for
hasNext)
* @param mode mode passed to RecursiveIteratoIterator (parent)
*/
- function __construct(RecursiveIterator $it, $rit_flags = 0, $cit_flags
= CachingIterator::CATCH_GET_CHILD, $mode = self::SELF_FIRST)
+ function __construct(RecursiveIterator $it, $rit_flags =
self::BYPASS_KEY, $cit_flags = CachingIterator::CATCH_GET_CHILD, $mode =
self::SELF_FIRST)
{
parent::__construct(new RecursiveCachingIterator($it,
$cit_flags), $mode, $rit_flags);
$this-rit_flags = $rit_flags;
@@ -91,7 +92,14 @@
*/
function key()
{
- return $this-getPrefix() . parent::key() .
$this-getPostfix();
+ if ($this-rit_flags self::BYPASS_KEY)
+ {
+ return parent::key();
+ }
+ else
+ {
+ return $this-getPrefix() . parent::key() .
$this-getPostfix();
+ }
}
/** Aggregates the inner iterator
--
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/spl/examples recursivetreeiterator.inc
helly Thu Oct 13 15:49:32 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl/examples recursivetreeiterator.inc
Log:
- MFH Add ability to bypass key() surrounding and make that default
http://cvs.php.net/diff.php/php-src/ext/spl/examples/recursivetreeiterator.inc?r1=1.1.2.5r2=1.1.2.6ty=u
Index: php-src/ext/spl/examples/recursivetreeiterator.inc
diff -u php-src/ext/spl/examples/recursivetreeiterator.inc:1.1.2.5
php-src/ext/spl/examples/recursivetreeiterator.inc:1.1.2.6
--- php-src/ext/spl/examples/recursivetreeiterator.inc:1.1.2.5 Sat Oct 8
15:09:58 2005
+++ php-src/ext/spl/examples/recursivetreeiterator.inc Thu Oct 13 15:49:27 2005
@@ -19,8 +19,8 @@
class RecursiveTreeIterator extends RecursiveIteratorIterator
{
const BYPASS_CURRENT = 0x0004;
+ const BYPASS_KEY = 0x0008;
- private $callToString;
private $rit_flags;
/**
@@ -29,11 +29,10 @@
* @param cit_flags flags passed to RecursiveCachingIterator (for
hasNext)
* @param mode mode passed to RecursiveIteratoIterator (parent)
*/
- function __construct(RecursiveIterator $it, $rit_flags = 0, $cit_flags
= CachingIterator::CATCH_GET_CHILD, $mode = self::SELF_FIRST)
+ function __construct(RecursiveIterator $it, $rit_flags =
self::BYPASS_KEY, $cit_flags = CachingIterator::CATCH_GET_CHILD, $mode =
self::SELF_FIRST)
{
parent::__construct(new RecursiveCachingIterator($it,
$cit_flags), $mode, $rit_flags);
$this-rit_flags = $rit_flags;
- $this-callToString = (bool)($cit_flags
CachingIterator::CALL_TOSTRING);
}
/** Prefix strings used in getPrefix()
@@ -65,7 +64,7 @@
*/
function getEntry()
{
- return $this-callToString ? $this-__toString() :
parent::current();
+ return @(string)parent::current();
}
/** @return string to place after the current element
@@ -78,14 +77,14 @@
/** @return the current element prefixed and postfixed
*/
function current()
- {
+ {
if ($this-rit_flags self::BYPASS_CURRENT)
{
return parent::current();
}
else
{
- return $this-getPrefix() . $this-getEntry() .
$this-getPostfix();
+ return $this-getPrefix() . $this-getEntry() .
$this-getPostfix();
}
}
@@ -93,7 +92,14 @@
*/
function key()
{
- return $this-getPrefix() . parent::key() .
$this-getPostfix();
+ if ($this-rit_flags self::BYPASS_KEY)
+ {
+ return parent::key();
+ }
+ else
+ {
+ return $this-getPrefix() . parent::key() .
$this-getPostfix();
+ }
}
/** Aggregates the inner iterator
--
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/pdo/tests pdo_031.phpt
helly Thu Oct 13 15:50:00 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo/tests pdo_031.phpt
Log:
- MFH SPL example was changed, so change PDO test accordingly
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_031.phpt?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/pdo/tests/pdo_031.phpt
diff -u php-src/ext/pdo/tests/pdo_031.phpt:1.1.2.2
php-src/ext/pdo/tests/pdo_031.phpt:1.1.2.3
--- php-src/ext/pdo/tests/pdo_031.phpt:1.1.2.2 Fri Oct 7 19:23:44 2005
+++ php-src/ext/pdo/tests/pdo_031.phpt Thu Oct 13 15:49:59 2005
@@ -38,7 +38,7 @@
$stmt = $db-query('SELECT * FROM test');
-foreach(new RecursiveTreeIterator(new
RecursiveArrayIterator($stmt-fetchAll(PDO::FETCH_ASSOC)),
RecursiveIteratorIterator::SELF_FIRST) as $c=$v)
+foreach(new RecursiveTreeIterator(new
RecursiveArrayIterator($stmt-fetchAll(PDO::FETCH_ASSOC)),
RecursiveTreeIterator::BYPASS_KEY) as $c=$v)
{
echo $v [$c]\n;
}
--
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) /ext/iconv config.m4
On 13.10.2005 23:28, Jani Taskinen wrote: - for i in /usr /usr/local; do -if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + for i in /usr/local /usr; do +if test -f $i/include/iconv.h || test -f $i/include/giconv.h; then Just curious: what's the problem with -o ? There are a lot of -o all over the sources: find . -name config.m4 | xargs grep -nH \-o | wc -l 51 Thanks for correcting it, btw. -- 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 / acinclude.m4
rrichards Thu Oct 13 16:16:44 2005 EDT Modified files: /php-srcacinclude.m4 Log: bump libxml min version to 2.6.11 http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.335r2=1.336ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.335 php-src/acinclude.m4:1.336 --- php-src/acinclude.m4:1.335 Thu Sep 1 04:25:32 2005 +++ php-src/acinclude.m4Thu Oct 13 16:16:39 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.335 2005/09/01 08:25:32 sniper Exp $ +dnl $Id: acinclude.m4,v 1.336 2005/10/13 20:16:39 rrichards Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2333,7 +2333,7 @@ set $libxml_full_version IFS=$ac_IFS LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3` -if test $LIBXML_VERSION -ge 2006008; then +if test $LIBXML_VERSION -ge 2006011; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) @@ -2356,7 +2356,7 @@ fi $2 else - AC_MSG_ERROR([libxml2 version 2.6.8 or greater required.]) + AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) fi ifelse([$3],[],,[else $3]) fi -- 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
rrichards Thu Oct 13 16:17:18 2005 EDT
Modified files:
/php-src/ext/libxml libxml.c
Log:
insure stream usage
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.36r2=1.37ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.36 php-src/ext/libxml/libxml.c:1.37
--- php-src/ext/libxml/libxml.c:1.36Thu Sep 8 06:33:57 2005
+++ php-src/ext/libxml/libxml.c Thu Oct 13 16:17:18 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.36 2005/09/08 10:33:57 rrichards Exp $ */
+/* $Id: libxml.c,v 1.37 2005/10/13 20:17:18 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -249,36 +249,6 @@
/* Channel libxml file io layer through the PHP streams subsystem.
* This allows use of ftps:// and https:// urls */
-int php_libxml_streams_IO_match_wrapper(const char *filename)
-{
- char *resolved_path;
- int retval, isescaped=0;
- xmlURI *uri;
-
- TSRMLS_FETCH();
-
- if (zend_is_executing(TSRMLS_C)) {
- uri = xmlParseURI((xmlChar *)filename);
- if (uri (uri-scheme == NULL || (xmlStrncmp(uri-scheme,
file, 4) == 0))) {
- resolved_path = xmlURIUnescapeString(filename, 0, NULL);
- isescaped = 1;
- } else {
- resolved_path = (char *)filename;
- }
-
- if (uri) {
- xmlFreeURI(uri);
- }
-
- retval = php_stream_locate_url_wrapper(resolved_path, NULL, 0
TSRMLS_CC) ? 1 : 0;
- if (resolved_path isescaped) {
- xmlFree(resolved_path);
- }
- return retval;
- }
- return 0;
-}
-
void *php_libxml_streams_IO_open_wrapper(const char *filename, const char
*mode, const int read_only)
{
php_stream_statbuf ssbuf;
@@ -362,6 +332,78 @@
return php_stream_close((php_stream*)context);
}
+xmlParserInputBufferPtr
+php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
+{
+xmlParserInputBufferPtr ret;
+void *context = NULL;
+
+if (URI == NULL)
+ return(NULL);
+
+ context = php_libxml_streams_IO_open_read_wrapper(URI);
+
+ if (context == NULL) {
+ return(NULL);
+ }
+
+ /* Allocate the Input buffer front-end. */
+ ret = xmlAllocParserInputBuffer(enc);
+ if (ret != NULL) {
+ ret-context = context;
+ ret-readcallback = php_libxml_streams_IO_read;
+ ret-closecallback = php_libxml_streams_IO_close;
+ } else
+ php_libxml_streams_IO_close(context);
+
+ return(ret);
+}
+
+xmlOutputBufferPtr
+php_libxml_output_buffer_create_filename(const char *URI,
+ xmlCharEncodingHandlerPtr encoder,
+ int compression ATTRIBUTE_UNUSED)
+{
+xmlOutputBufferPtr ret;
+xmlURIPtr puri;
+void *context = NULL;
+char *unescaped = NULL;
+
+ if (URI == NULL)
+ return(NULL);
+
+ puri = xmlParseURI(URI);
+ if (puri != NULL) {
+ if (puri-scheme != NULL)
+ unescaped = xmlURIUnescapeString(URI, 0, NULL);
+ xmlFreeURI(puri);
+ }
+
+ if (unescaped != NULL) {
+ context = php_libxml_streams_IO_open_write_wrapper(unescaped);
+ xmlFree(unescaped);
+ }
+
+/* try with a non-escaped URI this may be a strange filename */
+ if (context == NULL) {
+ context = context =
php_libxml_streams_IO_open_write_wrapper(URI);
+ }
+
+ if (context == NULL) {
+ return(NULL);
+ }
+
+ /* Allocate the Output buffer front-end. */
+ ret = xmlAllocOutputBuffer(encoder);
+ if (ret != NULL) {
+ ret-context = context;
+ ret-writecallback = php_libxml_streams_IO_write;
+ ret-closecallback = php_libxml_streams_IO_close;
+ }
+
+ return(ret);
+}
+
static int _php_libxml_free_error(xmlErrorPtr error) {
/* This will free the libxml alloc'd memory */
xmlResetError(error);
@@ -501,22 +543,6 @@
/* we should be the only one's to ever init!! */
xmlInitParser();
- /* Enable php stream/wrapper support for libxml
- we only use php streams, so we do not enable
- the default io handlers in libxml.
- */
- xmlRegisterInputCallbacks(
- php_libxml_streams_IO_match_wrapper,
- php_libxml_streams_IO_open_read_wrapper,
- php_libxml_streams_IO_read,
- php_libxml_streams_IO_close);
-
- xmlRegisterOutputCallbacks(
- php_libxml_streams_IO_match_wrapper,
-
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/libxml libxml.c
rrichards Thu Oct 13 16:34:37 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/libxml libxml.c
Log:
MFH: insure stream usage
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.32.2.2r2=1.32.2.3ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.2
php-src/ext/libxml/libxml.c:1.32.2.3
--- php-src/ext/libxml/libxml.c:1.32.2.2Thu Sep 8 06:37:57 2005
+++ php-src/ext/libxml/libxml.c Thu Oct 13 16:34:37 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.2 2005/09/08 10:37:57 rrichards Exp $ */
+/* $Id: libxml.c,v 1.32.2.3 2005/10/13 20:34:37 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -249,36 +249,6 @@
/* Channel libxml file io layer through the PHP streams subsystem.
* This allows use of ftps:// and https:// urls */
-int php_libxml_streams_IO_match_wrapper(const char *filename)
-{
- char *resolved_path;
- int retval, isescaped=0;
- xmlURI *uri;
-
- TSRMLS_FETCH();
-
- if (zend_is_executing(TSRMLS_C)) {
- uri = xmlParseURI((xmlChar *)filename);
- if (uri (uri-scheme == NULL || (xmlStrncmp(uri-scheme,
file, 4) == 0))) {
- resolved_path = xmlURIUnescapeString(filename, 0, NULL);
- isescaped = 1;
- } else {
- resolved_path = (char *)filename;
- }
-
- if (uri) {
- xmlFreeURI(uri);
- }
-
- retval = php_stream_locate_url_wrapper(resolved_path, NULL, 0
TSRMLS_CC) ? 1 : 0;
- if (resolved_path isescaped) {
- xmlFree(resolved_path);
- }
- return retval;
- }
- return 0;
-}
-
void *php_libxml_streams_IO_open_wrapper(const char *filename, const char
*mode, const int read_only)
{
php_stream_statbuf ssbuf;
@@ -362,6 +332,78 @@
return php_stream_close((php_stream*)context);
}
+xmlParserInputBufferPtr
+php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
+{
+xmlParserInputBufferPtr ret;
+void *context = NULL;
+
+if (URI == NULL)
+ return(NULL);
+
+ context = php_libxml_streams_IO_open_read_wrapper(URI);
+
+ if (context == NULL) {
+ return(NULL);
+ }
+
+ /* Allocate the Input buffer front-end. */
+ ret = xmlAllocParserInputBuffer(enc);
+ if (ret != NULL) {
+ ret-context = context;
+ ret-readcallback = php_libxml_streams_IO_read;
+ ret-closecallback = php_libxml_streams_IO_close;
+ } else
+ php_libxml_streams_IO_close(context);
+
+ return(ret);
+}
+
+xmlOutputBufferPtr
+php_libxml_output_buffer_create_filename(const char *URI,
+ xmlCharEncodingHandlerPtr encoder,
+ int compression ATTRIBUTE_UNUSED)
+{
+xmlOutputBufferPtr ret;
+xmlURIPtr puri;
+void *context = NULL;
+char *unescaped = NULL;
+
+ if (URI == NULL)
+ return(NULL);
+
+ puri = xmlParseURI(URI);
+ if (puri != NULL) {
+ if (puri-scheme != NULL)
+ unescaped = xmlURIUnescapeString(URI, 0, NULL);
+ xmlFreeURI(puri);
+ }
+
+ if (unescaped != NULL) {
+ context = php_libxml_streams_IO_open_write_wrapper(unescaped);
+ xmlFree(unescaped);
+ }
+
+/* try with a non-escaped URI this may be a strange filename */
+ if (context == NULL) {
+ context = context =
php_libxml_streams_IO_open_write_wrapper(URI);
+ }
+
+ if (context == NULL) {
+ return(NULL);
+ }
+
+ /* Allocate the Output buffer front-end. */
+ ret = xmlAllocOutputBuffer(encoder);
+ if (ret != NULL) {
+ ret-context = context;
+ ret-writecallback = php_libxml_streams_IO_write;
+ ret-closecallback = php_libxml_streams_IO_close;
+ }
+
+ return(ret);
+}
+
static int _php_libxml_free_error(xmlErrorPtr error) {
/* This will free the libxml alloc'd memory */
xmlResetError(error);
@@ -501,22 +543,6 @@
/* we should be the only one's to ever init!! */
xmlInitParser();
- /* Enable php stream/wrapper support for libxml
- we only use php streams, so we do not enable
- the default io handlers in libxml.
- */
- xmlRegisterInputCallbacks(
- php_libxml_streams_IO_match_wrapper,
- php_libxml_streams_IO_open_read_wrapper,
- php_libxml_streams_IO_read,
- php_libxml_streams_IO_close);
-
- xmlRegisterOutputCallbacks(
-
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/iconv config.m4
On Thu, 13 Oct 2005, Antony Dovgal wrote: On 13.10.2005 23:28, Jani Taskinen wrote: - for i in /usr /usr/local; do -if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + for i in /usr/local /usr; do +if test -f $i/include/iconv.h || test -f $i/include/giconv.h; then Just curious: what's the problem with -o ? There are a lot of -o all over the sources: find . -name config.m4 | xargs grep -nH \-o | wc -l 51 Someone claimed -o is not supported in all 'test' implementations. Using || is a bit clearer too and definately supported. --Jani -- 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) /ext/iconv config.m4
On 14.10.2005 00:48, Jani Taskinen wrote: On Thu, 13 Oct 2005, Antony Dovgal wrote: On 13.10.2005 23:28, Jani Taskinen wrote: - for i in /usr /usr/local; do -if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + for i in /usr/local /usr; do +if test -f $i/include/iconv.h || test -f $i/include/giconv.h; then Just curious: what's the problem with -o ? There are a lot of -o all over the sources: find . -name config.m4 | xargs grep -nH \-o | wc -l 51 Someone claimed -o is not supported in all 'test' implementations. Using || is a bit clearer too and definately supported. So.. Are you going to change all the -o's to || everywhere ? -- 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/xmlreader php_xmlreader.c php_xmlreader.h /ext/xmlreader/examples xmlreader_file.php xmlreader_string.php xmlreader_validatedtd.php
rrichards Thu Oct 13 17:19:14 2005 EDT Modified files: /php-src/ext/xmlreader php_xmlreader.c php_xmlreader.h /php-src/ext/xmlreader/examples xmlreader_file.php xmlreader_string.php xmlreader_validatedtd.php Log: move constants to class http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.16r2=1.17ty=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.16 php-src/ext/xmlreader/php_xmlreader.c:1.17 --- php-src/ext/xmlreader/php_xmlreader.c:1.16 Fri Oct 7 09:26:11 2005 +++ php-src/ext/xmlreader/php_xmlreader.c Thu Oct 13 17:19:13 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_xmlreader.c,v 1.16 2005/10/07 13:26:11 rrichards Exp $ */ +/* $Id: php_xmlreader.c,v 1.17 2005/10/13 21:19:13 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1114,36 +1114,37 @@ xmlreader_register_prop_handler(xmlreader_prop_handlers, xmlLang, NULL, xmlTextReaderConstXmlLang, IS_STRING TSRMLS_CC); /* Constants for NodeType - cannot define common types to share with dom as there are differences in these types */ - REGISTER_LONG_CONSTANT(XMLREADER_NONE, XML_READER_TYPE_NONE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ELEMENT, XML_READER_TYPE_ELEMENT,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ATTRIBUTE, XML_READER_TYPE_ATTRIBUTE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_TEXT, XML_READER_TYPE_TEXT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_CDATA, XML_READER_TYPE_CDATA, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ENTITY_REF, XML_READER_TYPE_ENTITY_REFERENCE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ENTITY, XML_READER_TYPE_ENTITY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_PI, XML_READER_TYPE_PROCESSING_INSTRUCTION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_COMMENT, XML_READER_TYPE_COMMENT,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_DOC, XML_READER_TYPE_DOCUMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_DOC_TYPE, XML_READER_TYPE_DOCUMENT_TYPE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_DOC_FRAGMENT, XML_READER_TYPE_DOCUMENT_FRAGMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_NOTATION, XML_READER_TYPE_NOTATION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_WHITESPACE, XML_READER_TYPE_WHITESPACE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_SIGNIFICANT_WHITESPACE, XML_READER_TYPE_SIGNIFICANT_WHITESPACE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_END_ELEMENT, XML_READER_TYPE_END_ELEMENT,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_END_ENTITY, XML_READER_TYPE_END_ENTITY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_XML_DECLARATION, XML_READER_TYPE_XML_DECLARATION,CONST_CS | CONST_PERSISTENT); + + REGISTER_XMLREADER_CLASS_CONST_LONG(NONE, XML_READER_TYPE_NONE); + REGISTER_XMLREADER_CLASS_CONST_LONG(ELEMENT, XML_READER_TYPE_ELEMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(ATTRIBUTE, XML_READER_TYPE_ATTRIBUTE); + REGISTER_XMLREADER_CLASS_CONST_LONG(TEXT, XML_READER_TYPE_TEXT); + REGISTER_XMLREADER_CLASS_CONST_LONG(CDATA,XML_READER_TYPE_CDATA); + REGISTER_XMLREADER_CLASS_CONST_LONG(ENTITY_REF, XML_READER_TYPE_ENTITY_REFERENCE); + REGISTER_XMLREADER_CLASS_CONST_LONG(ENTITY, XML_READER_TYPE_ENTITY); + REGISTER_XMLREADER_CLASS_CONST_LONG(PI, XML_READER_TYPE_PROCESSING_INSTRUCTION); + REGISTER_XMLREADER_CLASS_CONST_LONG(COMMENT, XML_READER_TYPE_COMMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(DOC, XML_READER_TYPE_DOCUMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(DOC_TYPE, XML_READER_TYPE_DOCUMENT_TYPE); + REGISTER_XMLREADER_CLASS_CONST_LONG(DOC_FRAGMENT, XML_READER_TYPE_DOCUMENT_FRAGMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(NOTATION, XML_READER_TYPE_NOTATION); + REGISTER_XMLREADER_CLASS_CONST_LONG(WHITESPACE, XML_READER_TYPE_WHITESPACE); +
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/xmlreader php_xmlreader.c php_xmlreader.h /ext/xmlreader/examples xmlreader_file.php xmlreader_string.php xmlreader_validatedtd.php
rrichards Thu Oct 13 17:20:12 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/xmlreader php_xmlreader.c php_xmlreader.h /php-src/ext/xmlreader/examples xmlreader_file.php xmlreader_string.php xmlreader_validatedtd.php Log: MFH: move constants to class http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13r2=1.13.2.1ty=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.1 --- php-src/ext/xmlreader/php_xmlreader.c:1.13 Wed Aug 3 10:08:21 2005 +++ php-src/ext/xmlreader/php_xmlreader.c Thu Oct 13 17:20:11 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_xmlreader.c,v 1.13 2005/08/03 14:08:21 sniper Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.1 2005/10/13 21:20:11 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1104,36 +1104,37 @@ xmlreader_register_prop_handler(xmlreader_prop_handlers, xmlLang, NULL, xmlTextReaderXmlLang, IS_STRING TSRMLS_CC); /* Constants for NodeType - cannot define common types to share with dom as there are differences in these types */ - REGISTER_LONG_CONSTANT(XMLREADER_NONE, XML_READER_TYPE_NONE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ELEMENT, XML_READER_TYPE_ELEMENT,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ATTRIBUTE, XML_READER_TYPE_ATTRIBUTE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_TEXT, XML_READER_TYPE_TEXT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_CDATA, XML_READER_TYPE_CDATA, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ENTITY_REF, XML_READER_TYPE_ENTITY_REFERENCE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_ENTITY, XML_READER_TYPE_ENTITY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_PI, XML_READER_TYPE_PROCESSING_INSTRUCTION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_COMMENT, XML_READER_TYPE_COMMENT,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_DOC, XML_READER_TYPE_DOCUMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_DOC_TYPE, XML_READER_TYPE_DOCUMENT_TYPE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_DOC_FRAGMENT, XML_READER_TYPE_DOCUMENT_FRAGMENT, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_NOTATION, XML_READER_TYPE_NOTATION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_WHITESPACE, XML_READER_TYPE_WHITESPACE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_SIGNIFICANT_WHITESPACE, XML_READER_TYPE_SIGNIFICANT_WHITESPACE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_END_ELEMENT, XML_READER_TYPE_END_ELEMENT,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_END_ENTITY, XML_READER_TYPE_END_ENTITY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(XMLREADER_XML_DECLARATION, XML_READER_TYPE_XML_DECLARATION,CONST_CS | CONST_PERSISTENT); + + REGISTER_XMLREADER_CLASS_CONST_LONG(NONE, XML_READER_TYPE_NONE); + REGISTER_XMLREADER_CLASS_CONST_LONG(ELEMENT, XML_READER_TYPE_ELEMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(ATTRIBUTE, XML_READER_TYPE_ATTRIBUTE); + REGISTER_XMLREADER_CLASS_CONST_LONG(TEXT, XML_READER_TYPE_TEXT); + REGISTER_XMLREADER_CLASS_CONST_LONG(CDATA,XML_READER_TYPE_CDATA); + REGISTER_XMLREADER_CLASS_CONST_LONG(ENTITY_REF, XML_READER_TYPE_ENTITY_REFERENCE); + REGISTER_XMLREADER_CLASS_CONST_LONG(ENTITY, XML_READER_TYPE_ENTITY); + REGISTER_XMLREADER_CLASS_CONST_LONG(PI, XML_READER_TYPE_PROCESSING_INSTRUCTION); + REGISTER_XMLREADER_CLASS_CONST_LONG(COMMENT, XML_READER_TYPE_COMMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(DOC, XML_READER_TYPE_DOCUMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(DOC_TYPE, XML_READER_TYPE_DOCUMENT_TYPE); + REGISTER_XMLREADER_CLASS_CONST_LONG(DOC_FRAGMENT, XML_READER_TYPE_DOCUMENT_FRAGMENT); + REGISTER_XMLREADER_CLASS_CONST_LONG(NOTATION, XML_READER_TYPE_NOTATION); + REGISTER_XMLREADER_CLASS_CONST_LONG(WHITESPACE, XML_READER_TYPE_WHITESPACE); +
[PHP-CVS] cvs: php-src /ext/mysqli/tests bug33491.phpt
iliaa Thu Oct 13 17:26:08 2005 EDT
Modified files:
/php-src/ext/mysqli/tests bug33491.phpt
Log:
Fixed test failure
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/bug33491.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/mysqli/tests/bug33491.phpt
diff -u php-src/ext/mysqli/tests/bug33491.phpt:1.1
php-src/ext/mysqli/tests/bug33491.phpt:1.2
--- php-src/ext/mysqli/tests/bug33491.phpt:1.1 Mon Jun 27 15:07:52 2005
+++ php-src/ext/mysqli/tests/bug33491.phpt Thu Oct 13 17:26:08 2005
@@ -15,8 +15,10 @@
}
}
+require_once dirname(__FILE__)./connect.inc;
+
// Segfault when using the DB class which extends mysqli
-$DB = new DB('localhost', 'root', '', '');
+$DB = new DB($host, $user, $passwd, '');
$DB-query_single('SELECT DATE()');
?
--
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) /ext/iconv config.m4
On Fri, 14 Oct 2005, Antony Dovgal wrote: Someone claimed -o is not supported in all 'test' implementations. Using || is a bit clearer too and definately supported. Are you going to change all the -o's to || everywhere ? Only if someone complains or in new stuff or someone uses it.. Feel free. I don't have the time. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
