[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Jun 6 20:35:45 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2005r2=1.2006ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2005 php-src/ChangeLog:1.2006 --- php-src/ChangeLog:1.2005Sun Jun 5 20:35:16 2005 +++ php-src/ChangeLog Mon Jun 6 20:35:44 2005 @@ -1,3 +1,233 @@ +2005-06-06 Wez Furlong [EMAIL PROTECTED] + +* ext/posix/config.m4 + ext/posix/posix.c: + fix build on Solaris + +2005-06-06 Jani Taskinen [EMAIL PROTECTED] + +* main/main.c: + silence warning + +2005-06-06 Brad House [EMAIL PROTECTED] + +* (PHP_5_0) + ext/mcve/mcve.c + ext/mcve/php_mcve.h: + libmonetra 5.0 sync. + added m_validateidentifier, which is enabled by default to keep invalid + pointer addresses from causing PHP to crash + kept compatability with older versions of libmonetra. + +* ext/mcve/mcve.c + ext/mcve/php_mcve.h: + libmonetra-5.0 sync. + added m_validateidentifier, which is enabled by default to keep invalid + pointer addresses from causing PHP to crash + kept compatability with older versions of libmonetra. + +2005-06-06 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + ext/bz2/bz2.c + ext/bz2/bz2.c: + MFH: Better storage size for output length. + +* ext/bz2/bz2.c: + Better storage size for output length. + +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_opcodes.h: + - Regenerate VM files and add warning about regeneration + +* (PHP_5_0) + ZendEngine2/zend_execute.c + ZendEngine2/zend_vm_def.h: + - MH44: Problems with user defined error handler and wrong usage of + references + +2005-06-06 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + ext/standard/type.c: + MFH: Fixed strval to not print notices on strval(array()). + +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + ext/standard/http_fopen_wrapper.c: + - MFH: Fixed bug #33242 (Mangled error message when stream fails). + +* (PHP_5_0) + NEWS + ext/standard/http_fopen_wrapper.c + ext/standard/http_fopen_wrapper.c: + - Fixed bug #33242 (Mangled error message when stream fails). + +2005-06-06 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_0) + scripts/Makefile.frag: + ws + +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + Zend/zend_execute.c: + - Swap lines so that user defined error handlers don't cause memory errors + +* (PHP_4_4) + scripts/Makefile.frag: + - We've man pages just fine + +2005-06-06 Dmitry Stogov [EMAIL PROTECTED] + +* NEWS + ZendEngine2/zend_compile.c + ZendEngine2/tests/bug32428.phpt: + Fixed bug #32428 (The @ warning error supression operator is broken) + +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS: + - Update NEWS with the bz fix + +2005-06-06 Uwe Schindler [EMAIL PROTECTED] + +* (PHP_4_4) + scripts/Makefile.frag: + MFH: Fix bug #33166 for other branches and new bug #33255, no man pages for + 4.4 + +* (PHP_5_0) + scripts/Makefile.frag: + Fix bug #33166 for other branches and new bug #33255 + +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + ext/bz2/bz2.c: + - Merge back changes which where in 4.3 but somehow didn't make it into the + new +branch. + +2005-06-06 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/tests/bug32799.phpt + ZendEngine2/tests/bug32799.phpt: + + file bug32799.phpt was initially added on branch PHP_5_0. + +* (PHP_5_0) + NEWS + ZendEngine2/zend_objects_API.c + ZendEngine2/zend_objects_API.c + ZendEngine2/tests/bug32799.phpt: + Fixed bug #32799 (crash: calling the corresponding global var during the + destruct) + +* ZendEngine2/tests/bug32596.phpt: + Added test for bug #32596 (Segfault/Memory Leak by getClass (etc) in + __destruct) + +* ZendEngine2/tests/bug32596.phpt + ZendEngine2/tests/bug32596.phpt: + + file bug32596.phpt was initially added on branch PHP_5_0. + +* (PHP_5_0) + NEWS + ZendEngine2/zend_execute_API.c: + Fixed bug #32596 (Segfault/Memory Leak by getClass (etc) in __destruct) + +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + Zend/zend_extensions.h: + - Bumb ZEND EXT API NO for Stanislav + +2005-06-06 Edin Kadribasic [EMAIL PROTECTED] + +* (PHP_4_4) + win32/php4dllts.dsp: + Sync with recent config.m4 changes + +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + Zend/zend_compile.c + Zend/zend_compile.h + Zend/zend_execute.c + Zend/zend_execute_globals.h +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Jun 6 20:35:55 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.703r2=1.704ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.703 ZendEngine2/ChangeLog:1.704 --- ZendEngine2/ChangeLog:1.703 Sat Jun 4 20:35:24 2005 +++ ZendEngine2/ChangeLog Mon Jun 6 20:35:54 2005 @@ -1,3 +1,87 @@ +2005-06-06 Derick Rethans [EMAIL PROTECTED] + +* zend_vm_def.h + zend_vm_execute.h + zend_vm_opcodes.h: + - Regenerate VM files and add warning about regeneration + +* (PHP_5_0) + zend_execute.c + zend_vm_def.h: + - MH44: Problems with user defined error handler and wrong usage of + references + +2005-06-06 Dmitry Stogov [EMAIL PROTECTED] + +* zend_compile.c + tests/bug32428.phpt: + Fixed bug #32428 (The @ warning error supression operator is broken) + +* zend_objects_API.c + zend_objects_API.c + tests/bug32799.phpt: + Fixed bug #32799 (crash: calling the corresponding global var during the + destruct) + +* tests/bug32799.phpt + tests/bug32799.phpt: + + file bug32799.phpt was initially added on branch PHP_5_0. + +* tests/bug32596.phpt: + Added test for bug #32596 (Segfault/Memory Leak by getClass (etc) in + __destruct) + +* tests/bug32596.phpt + tests/bug32596.phpt: + + file bug32596.phpt was initially added on branch PHP_5_0. + +* (PHP_5_0) + zend_execute_API.c: + Fixed bug #32596 (Segfault/Memory Leak by getClass (etc) in __destruct) + +* (PHP_5_0) + tests/bug32993.phpt: + Added test for bug #32993 (implemented Iterator function current() don't + throw +exception) + +* tests/bug32993.phpt + tests/bug32993.phpt: + + Fixed bug #32993 (implemented Iterator function current() don't throw + exception) + +* zend_vm_def.h + zend_vm_execute.h + zend_vm_opcodes.h: + Fixed bug #32993 (implemented Iterator function current() don't throw + exception) + +* zend_object_handlers.c + zend_object_handlers.c + tests/bug33171.phpt: + Fixed bug #33171 (foreach enumerates private fields declared in base + classes) + +* tests/bug33171.phpt + tests/bug33171.phpt: + + file bug33171.phpt was initially added on branch PHP_5_0. + +2005-06-06 Wez Furlong [EMAIL PROTECTED] + +* zend_language_scanner.l: + Avoid double-freeing streams. + This can happen because all streams are registered as resources; + the engine also tracks them in the open_files global. + + Avoid the potential for double-freeing by simply making streams exposed to + the + engine have no closer for the engine to call; they will already be in the + resource list, and thus will be shut down properly at request end. + 2005-06-04 Zeev Suraski [EMAIL PROTECTED] * zend_compile.h @@ -8157,7 +8241,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.703 2005/06/05 00:35:24 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.704 2005/06/07 00:35:54 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -9881,7 +9965,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.703 2005/06/05 00:35:24 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.704 2005/06/07 00:35:54 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
helly Mon Jun 6 03:11:10 2005 EDT Modified files: /php-src/sapi/cli php_cli.c Log: - Expose -a as special mode and show whether it is a shell or not http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.125r2=1.126ty=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.125 php-src/sapi/cli/php_cli.c:1.126 --- php-src/sapi/cli/php_cli.c:1.125Tue May 17 10:33:15 2005 +++ php-src/sapi/cli/php_cli.c Mon Jun 6 03:11:08 2005 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.125 2005/05/17 14:33:15 johannes Exp $ */ +/* $Id: php_cli.c,v 1.126 2005/06/06 07:11:08 helly Exp $ */ #include php.h #include php_globals.h @@ -385,8 +385,13 @@ %s [options] [-B begin_code] -R code [-E end_code] [--] [args...]\n %s [options] [-B begin_code] -F file [-E end_code] [--] [args...]\n %s [options] -- [args...]\n + %s [options] -a\n \n +#if HAVE_LIBREADLINE || HAVE_LIBEDIT + -a Run as interactive shell\n +#else -a Run interactively\n +#endif -c path|file Look for php.ini file in this directory\n -n No php.ini file will be used\n -d foo[=bar] Define INI entry foo with value 'bar'\n @@ -410,7 +415,7 @@ args... Arguments passed to script. Use -- args when first argument\n starts with - or script is read from stdin\n \n - , prog, prog, prog, prog, prog); + , prog, prog, prog, prog, prog, prog); } /* }}} */ -- 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) / configure.in /main php_version.h
derick Mon Jun 6 05:23:59 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcconfigure.in /php-src/main php_version.h Log: - Rename version. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.164r2=1.396.2.164.2.1ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164 php-src/configure.in:1.396.2.164.2.1 --- php-src/configure.in:1.396.2.164Thu Jun 2 17:32:49 2005 +++ php-src/configure.inMon Jun 6 05:23:55 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164 2005/06/02 21:32:49 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.1 2005/06/06 09:23:55 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -39,8 +39,8 @@ AC_CONFIG_HEADER(main/php_config.h) MAJOR_VERSION=4 -MINOR_VERSION=3 -RELEASE_VERSION=12 +MINOR_VERSION=4 +RELEASE_VERSION=0 EXTRA_VERSION=-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.81r2=1.66.2.81.2.1ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81 php-src/main/php_version.h:1.66.2.81.2.1 --- php-src/main/php_version.h:1.66.2.81Wed Mar 30 17:10:25 2005 +++ php-src/main/php_version.h Mon Jun 6 05:23:58 2005 @@ -1,7 +1,7 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 4 -#define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 12 +#define PHP_MINOR_VERSION 4 +#define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 4.3.12-dev +#define PHP_VERSION 4.4.0-dev -- 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/bz2 bz2.c /scripts/man1 php-config.1.in phpize.1.in
derick Mon Jun 6 06:59:47 2005 EDT
Added files: (Branch: PHP_4_4)
/php-src/scripts/man1 php-config.1.in phpize.1.in
Modified files:
/php-src/ext/bz2bz2.c
Log:
- Merge back changes which where in 4.3 but somehow didn't make it into the
new
branch.
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.1.2.4r2=1.1.2.4.2.1ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.1.2.4 php-src/ext/bz2/bz2.c:1.1.2.4.2.1
--- php-src/ext/bz2/bz2.c:1.1.2.4 Sat Mar 19 08:56:56 2005
+++ php-src/ext/bz2/bz2.c Mon Jun 6 06:59:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.1.2.4 2005/03/19 13:56:56 tony2001 Exp $ */
+/* $Id: bz2.c,v 1.1.2.4.2.1 2005/06/06 10:59:45 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -40,9 +40,6 @@
#define PHP_BZ_ERRSTR 1
#define PHP_BZ_ERRBOTH 2
-/* Blocksize of the decompression buffer */
-#define PHP_BZ_DECOMPRESS_SIZE 4096
-
function_entry bz2_functions[] = {
PHP_FE(bzopen, NULL)
PHP_FE(bzread, NULL)
@@ -434,56 +431,49 @@
Decompresses BZip2 compressed data */
PHP_FUNCTION(bzdecompress)
{
- zval**source, /* Source data to
decompress */
- **zsmall; /* (Optional) user
specified small */
- char *dest; /* Destination buffer,
initially allocated */
- int error, /* Error container */
- iter = 1, /* Iteration count for
the compression loop */
- size, /* Current size
to realloc the dest buffer to */
- dest_len = PHP_BZ_DECOMPRESS_SIZE, /* Size of the
destination length */
- small= 0, /* The actual
small */
- argc = ZEND_NUM_ARGS(); /* Argument count
*/
-
- if (argc 1 || argc 2 || zend_get_parameters_ex(argc, source,
zsmall) == FAILURE) {
- WRONG_PARAM_COUNT;
+ char *source, *dest;
+ int source_len, error;
+ long small = 0;
+ unsigned int size = 0;
+ bz_stream bzs;
+
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
source, source_len, small)) {
+ RETURN_FALSE;
}
- convert_to_string_ex(source);
-
- /* optional small argument handling */
- if (argc 1) {
- convert_to_long_ex(zsmall);
- small = Z_LVAL_PP(zsmall);
+ bzs.bzalloc = NULL;
+ bzs.bzfree = NULL;
+
+ if (BZ2_bzDecompressInit(bzs, 0, small) != BZ_OK) {
+ RETURN_FALSE;
}
- /* Depending on the size of the source buffer, either allocate
- the length of the source buffer or the a default decompression
- size */
- dest = emalloc(PHP_BZ_DECOMPRESS_SIZE Z_STRLEN_PP(source) ?
PHP_BZ_DECOMPRESS_SIZE : Z_STRLEN_PP(source));
-
- /* (de)Compression Loop */
- do {
- /* Handle the (re)allocation of the buffer */
- size = dest_len * iter;
- if (iter 1) {
- dest = erealloc(dest, size);
- }
- ++iter;
+ bzs.next_in = source;
+ bzs.avail_in = source_len;
- /* Perform the decompression */
- error = BZ2_bzBuffToBuffDecompress(dest, size,
Z_STRVAL_PP(source), Z_STRLEN_PP(source), small, 0);
- } while (error == BZ_OUTBUFF_FULL);
-
- if (error != BZ_OK) {
- efree(dest);
- RETURN_LONG(error);
- } else {
- /* we might have allocated a little to much, so erealloc the
buffer
-down to size, before returning it */
+ /* in most cases bz2 offers at least 2:1 compression, so we use that as
our base */
+ bzs.avail_out = source_len * 2;
+ bzs.next_out = dest = emalloc(bzs.avail_out + 1);
+
+ while ((error = BZ2_bzDecompress(bzs)) == BZ_OK bzs.avail_in 0) {
+ /* compression is better then 2:1, need to allocate more memory
*/
+ bzs.avail_out = source_len;
+ size = (bzs.total_out_hi32 32) + bzs.total_out_lo32;
+ dest = erealloc(dest, size + bzs.avail_out + 1);
+ bzs.next_out = dest + size;
+ }
+
+ if (error == BZ_STREAM_END || error == BZ_OK) {
+ size = (bzs.total_out_hi32 32) + bzs.total_out_lo32;
dest = erealloc(dest, size + 1);
- dest[size] = 0;
- RETURN_STRINGL(dest, size, 0);
+ dest[size] = '\0';
+ RETVAL_STRINGL(dest, size, 0);
+ } else { /* real error */
+ efree(dest);
+
[PHP-CVS] cvs: php-src(PHP_5_0) /scripts Makefile.frag
thetaphiMon Jun 6 07:00:48 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/scriptsMakefile.frag Log: Fix bug #33166 for other branches and new bug #33255 http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.10.2.7r2=1.10.2.8ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.10.2.7 php-src/scripts/Makefile.frag:1.10.2.8 --- php-src/scripts/Makefile.frag:1.10.2.7 Sat Apr 30 00:30:20 2005 +++ php-src/scripts/Makefile.frag Mon Jun 6 07:00:48 2005 @@ -21,7 +21,6 @@ config.sub bin_SCRIPTS = phpize php-config -bin_src_SCRIPTS = man_PAGES = phpize.1 php-config.1 install-build: @@ -76,10 +75,6 @@ echo program: $(program_prefix)$$prog$(program_suffix); \ $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done - @for prog in $(bin_src_SCRIPTS); do \ - echo program: $(program_prefix)$$prog$(program_suffix); \ - $(INSTALL) -m 755 $(top_srcdir)/scripts/$$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 \ -- 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) /scripts Makefile.frag
thetaphiMon Jun 6 07:06:23 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/scriptsMakefile.frag Log: MFH: Fix bug #33166 for other branches and new bug #33255, no man pages for 4.4 http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.1.2.11r2=1.1.2.11.2.1ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.1.2.11 php-src/scripts/Makefile.frag:1.1.2.11.2.1 --- php-src/scripts/Makefile.frag:1.1.2.11 Sat Apr 30 00:28:24 2005 +++ php-src/scripts/Makefile.frag Mon Jun 6 07:06:22 2005 @@ -21,7 +21,6 @@ config.sub bin_SCRIPTS = phpize php-config -bin_src_SCRIPTS = install-build: @echo Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/ @@ -63,16 +62,6 @@ echo program: $(program_prefix)$$prog$(program_suffix); \ $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done - @for prog in $(bin_src_SCRIPTS); do \ - echo program: $(program_prefix)$$prog$(program_suffix); \ - $(INSTALL) -m 755 $(top_srcdir)/scripts/$$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; \ - done $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(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
derick Mon Jun 6 07:07:57 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: - Update NEWS with the bz fix http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.1r2=1.1247.2.920.2.2ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.1 php-src/NEWS:1.1247.2.920.2.2 --- php-src/NEWS:1.1247.2.920.2.1 Mon Jun 6 05:30:09 2005 +++ php-src/NEWSMon Jun 6 07:07:55 2005 @@ -7,7 +7,7 @@ them sort based on the current locale. (Derick) - Changed sha1_file() and md5_file() functions to use streams instead of low level IO. (Uwe) -- Fixed memory curruptions when using references in a wrong way. (Marcus, +- Fixed memory corruptions when using references in a wrong way. (Marcus, Dmitry, Derick) - Fixed memory corruption in stristr(). (Derick) - Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony) @@ -18,6 +18,8 @@ misbehave). (Jani) - Fixed bug #33072 (Add a safemode/open_basedir check for runtime save_path change) (Rasmus) +- Fixed bug #33070 (Improved performance of bzdecompress() by several orders + of magnitude). (Ilia) - Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per RFC 2616 section 10.3.5) (Rasmus, Choitel) - Fixed bug #33019 (socket errors cause memory leaks in php_strerror()). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_4) /scripts Makefile.frag
On Mon, 6 Jun 2005, Uwe Schindler wrote: thetaphi Mon Jun 6 07:06:23 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/scripts Makefile.frag Log: MFH: Fix bug #33166 for other branches and new bug #33255, no man pages for 4.4 Please revert! 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(PHP_4_4) /scripts Makefile.frag
derick Mon Jun 6 07:24:17 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/scriptsMakefile.frag Log: - We've man pages just fine http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.1.2.11.2.1r2=1.1.2.11.2.2ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.1.2.11.2.1 php-src/scripts/Makefile.frag:1.1.2.11.2.2 --- php-src/scripts/Makefile.frag:1.1.2.11.2.1 Mon Jun 6 07:06:22 2005 +++ php-src/scripts/Makefile.frag Mon Jun 6 07:24:16 2005 @@ -21,6 +21,7 @@ config.sub bin_SCRIPTS = phpize php-config +bin_src_SCRIPTS = install-build: @echo Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/ @@ -62,6 +63,16 @@ echo program: $(program_prefix)$$prog$(program_suffix); \ $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done + @for prog in $(bin_src_SCRIPTS); do \ + echo program: $(program_prefix)$$prog$(program_suffix); \ + $(INSTALL) -m 755 $(top_srcdir)/scripts/$$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; \ + done $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(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_5_0) /scripts Makefile.frag
sniper Mon Jun 6 07:50:25 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/scriptsMakefile.frag Log: ws http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.10.2.8r2=1.10.2.9ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.10.2.8 php-src/scripts/Makefile.frag:1.10.2.9 --- php-src/scripts/Makefile.frag:1.10.2.8 Mon Jun 6 07:00:48 2005 +++ php-src/scripts/Makefile.frag Mon Jun 6 07:50:25 2005 @@ -47,7 +47,7 @@ ext/xml/expat/ \ ext/mbstring/ \ ext/mbstring/libmbfl/ \ -ext/mbstring/libmbfl/mbfl/ \ + ext/mbstring/libmbfl/mbfl/ \ ext/sqlite/libsqlite/src/sqlite.h install-headers: -- 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/standard http_fopen_wrapper.c
derick Mon Jun 6 08:41:29 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard http_fopen_wrapper.c
/php-srcNEWS
Log:
- Fixed bug #33242 (Mangled error message when stream fails).
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.88.2.3r2=1.88.2.4ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.88.2.3
php-src/ext/standard/http_fopen_wrapper.c:1.88.2.4
--- php-src/ext/standard/http_fopen_wrapper.c:1.88.2.3 Thu May 5 22:19:36 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Mon Jun 6 08:41:28 2005
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.88.2.3 2005/05/06 02:19:36 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.88.2.4 2005/06/06 12:41:28 derick Exp $ */
#include php.h
#include php_globals.h
@@ -101,6 +101,8 @@
char *transport_string, *errstr = NULL;
int transport_len, have_header = 0, request_fulluri = 0;
+ tmp_line[0] = '\0';
+
if (redirect_max 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Circular redirect,
aborting.);
return NULL;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.422r2=1.1760.2.423ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.422 php-src/NEWS:1.1760.2.423
--- php-src/NEWS:1.1760.2.422 Mon Jun 6 06:38:21 2005
+++ php-src/NEWSMon Jun 6 08:41:28 2005
@@ -14,6 +14,7 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33242 (Mangled error message when stream fails). (Derick)
- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches). (rich at kastle dot com, Tony)
--
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 /ext/standard http_fopen_wrapper.c
derick Mon Jun 6 08:42:52 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard http_fopen_wrapper.c
/php-srcNEWS
Log:
- MFH: Fixed bug #33242 (Mangled error message when stream fails).
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.20r2=1.53.2.20.2.1ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.1
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20 Thu May 5 22:19:04 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Mon Jun 6 08:42:50 2005
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.53.2.20 2005/05/06 02:19:04 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.53.2.20.2.1 2005/06/06 12:42:50 derick Exp $
*/
#include php.h
#include php_globals.h
@@ -107,6 +107,8 @@
size_t chunk_size = 0, file_size = 0;
int eol_detect, have_header = 0;
+ tmp_line[0] = '\0';
+
if (redirect_max 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Circular redirect,
aborting.);
return NULL;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.2r2=1.1247.2.920.2.3ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.2 php-src/NEWS:1.1247.2.920.2.3
--- php-src/NEWS:1.1247.2.920.2.2 Mon Jun 6 07:07:55 2005
+++ php-src/NEWSMon Jun 6 08:42:51 2005
@@ -10,6 +10,7 @@
- Fixed memory corruptions when using references in a wrong way. (Marcus,
Dmitry, Derick)
- Fixed memory corruption in stristr(). (Derick)
+- Fixed bug #33242 (Mangled error message when stream fails). (Derick)
- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches). (rich at kastle dot com, Tony)
--
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 type.c
iliaa Mon Jun 6 08:50:57 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard type.c
Log:
MFH: Fixed strval to not print notices on strval(array()).
http://cvs.php.net/diff.php/php-src/ext/standard/type.c?r1=1.20.4.2r2=1.20.4.2.4.1ty=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.20.4.2
php-src/ext/standard/type.c:1.20.4.2.4.1
--- php-src/ext/standard/type.c:1.20.4.2Thu Apr 1 03:56:32 2004
+++ php-src/ext/standard/type.c Mon Jun 6 08:50:57 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: type.c,v 1.20.4.2 2004/04/01 08:56:32 derick Exp $ */
+/* $Id: type.c,v 1.20.4.2.4.1 2005/06/06 12:50:57 iliaa Exp $ */
#include php.h
#include php_incomplete_class.h
@@ -180,14 +180,24 @@
PHP_FUNCTION(strval)
{
pval **num;
+ zval expr_copy;
+ int use_copy;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, num) == FAILURE)
{
WRONG_PARAM_COUNT;
}
*return_value = **num;
- zval_copy_ctor(return_value);
- convert_to_string(return_value);
+
+ zend_make_printable_zval(return_value, expr_copy, use_copy);
+ if (use_copy) {
+ *return_value = expr_copy;
+ INIT_PZVAL(return_value);
+ zval_copy_ctor(return_value);
+ zval_dtor(expr_copy);
+ } else {
+ zval_copy_ctor(return_value);
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/bz2 bz2.c
iliaa Mon Jun 6 12:30:49 2005 EDT
Modified files:
/php-src/ext/bz2bz2.c
Log:
Better storage size for output length.
# Thanks to Stefan for noticing the problem.
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.10r2=1.11ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.10 php-src/ext/bz2/bz2.c:1.11
--- php-src/ext/bz2/bz2.c:1.10 Sun Jun 5 14:04:20 2005
+++ php-src/ext/bz2/bz2.c Mon Jun 6 12:30:46 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.10 2005/06/05 18:04:20 iliaa Exp $ */
+/* $Id: bz2.c,v 1.11 2005/06/06 16:30:46 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -441,7 +441,7 @@
char *source, *dest;
int source_len, error;
long small = 0;
- unsigned int size = 0;
+ unsigned long long size = 0;
bz_stream bzs;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
source, source_len, small)) {
--
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/bz2 bz2.c
iliaa Mon Jun 6 12:31:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/bz2bz2.c
Log:
MFH: Better storage size for output length.
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.6.2.3r2=1.6.2.4ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.6.2.3 php-src/ext/bz2/bz2.c:1.6.2.4
--- php-src/ext/bz2/bz2.c:1.6.2.3 Sun Jun 5 14:05:07 2005
+++ php-src/ext/bz2/bz2.c Mon Jun 6 12:31:00 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.6.2.3 2005/06/05 18:05:07 iliaa Exp $ */
+/* $Id: bz2.c,v 1.6.2.4 2005/06/06 16:31:00 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -438,7 +438,7 @@
char *source, *dest;
int source_len, error;
long small = 0;
- unsigned int size = 0;
+ unsigned long long size = 0;
bz_stream bzs;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
source, source_len, small)) {
--
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/bz2 bz2.c
iliaa Mon Jun 6 12:31:08 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/bz2bz2.c
Log:
MFH: Better storage size for output length.
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.1.2.4.2.1r2=1.1.2.4.2.2ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.1.2.4.2.1 php-src/ext/bz2/bz2.c:1.1.2.4.2.2
--- php-src/ext/bz2/bz2.c:1.1.2.4.2.1 Mon Jun 6 06:59:45 2005
+++ php-src/ext/bz2/bz2.c Mon Jun 6 12:31:08 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.1.2.4.2.1 2005/06/06 10:59:45 derick Exp $ */
+/* $Id: bz2.c,v 1.1.2.4.2.2 2005/06/06 16:31:08 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -434,7 +434,7 @@
char *source, *dest;
int source_len, error;
long small = 0;
- unsigned int size = 0;
+ unsigned long long size = 0;
bz_stream bzs;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
source, source_len, small)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
bradmsswMon Jun 6 12:43:23 2005 EDT
Modified files:
/php-src/ext/mcve mcve.c php_mcve.h
Log:
libmonetra-5.0 sync.
added m_validateidentifier, which is enabled by default to keep invalid
pointer addresses from causing PHP to crash
kept compatability with older versions of libmonetra.
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.30r2=1.31ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.30 php-src/ext/mcve/mcve.c:1.31
--- php-src/ext/mcve/mcve.c:1.30Sun Jan 9 16:05:05 2005
+++ php-src/ext/mcve/mcve.c Mon Jun 6 12:43:23 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mcve.c,v 1.30 2005/01/09 21:05:05 sniper Exp $ */
+/* $Id: mcve.c,v 1.31 2005/06/06 16:43:23 bradmssw Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -73,6 +73,10 @@
PHP_FE(m_connect, NULL)
PHP_FE(m_transnew, NULL)
PHP_FE(m_transparam,NULL)
+#if LIBMONETRA_VERSION = 05
+ PHP_FE(m_transkeyval, NULL)
+ PHP_FE(m_validateidentifier,NULL)
+#endif
PHP_FE(m_transsend, NULL)
PHP_FE(m_ping, NULL)
PHP_FE(m_responseparam, NULL)
@@ -550,7 +554,7 @@
PHP_MINFO_FUNCTION(mcve)
{
php_info_print_table_start();
- php_info_print_table_row(2, mcve support, enabled);
+ php_info_print_table_row(2, mcve/monetra support, enabled);
php_info_print_table_row(2, version, PHP_MCVE_VERSION);
php_info_print_table_end();
}
@@ -589,6 +593,11 @@
MCVE_InitConn(conn);
+/* Since the identifiers are pointer addresses, we need to validate it by
+ * checking our linked list in PHP, since we don't want to cause segfaults */
+#if LIBMONETRA_VERSION = 05
+ M_ValidateIdentifier(conn, 1);
+#endif
ZEND_REGISTER_RESOURCE(return_value, conn, le_conn);
}
/* }}} */
@@ -890,7 +899,7 @@
PHP_FUNCTION(m_connectionerror)
{
MCVE_CONN *conn;
- char *retval;
+ const char *retval;
zval **arg;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
@@ -903,7 +912,7 @@
if (retval == NULL) {
RETVAL_STRING(,1);
} else {
- RETVAL_STRING(retval, 1);
+ RETVAL_STRING(estrdup(retval), 0);
}
}
/* }}} */
@@ -965,8 +974,53 @@
}
/* }}} */
+#if LIBMONETRA_VERSION = 05
+/* {{{ proto int m_validateidentifier(resource conn, int tf)
+ Whether or not to validate the passed identifier on any transaction it is
passed to
+*/
+PHP_FUNCTION(m_validateidentifier)
+{
+ MCVE_CONN *conn;
+ int retval;
+ zval **arg1, **arg2;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, arg1, arg2) ==
FAILURE)
+ WRONG_PARAM_COUNT;
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, mcve connection,
le_conn);
+
+ convert_to_long_ex(arg2);
+ retval = M_ValidateIdentifier(conn, (int)Z_LVAL_PP(arg2));
+ RETURN_LONG(retval);
+}
+/* }}} */
+
+/* {{{ proto int m_transkeyval(resource conn, long identifier, string key,
string value)
+ Add key/value pair to a transaction. Replaces deprecated transparam() */
+PHP_FUNCTION(m_transkeyval)
+{
+ MCVE_CONN *conn;
+ int retval;
+ zval **arg1, **arg2, **arg3, **arg4;
+
+ if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, arg1, arg2,
arg3, arg4) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, mcve connection,
le_conn);
+
+ convert_to_long_ex(arg2);
+ convert_to_string_ex(arg3);
+ convert_to_string_ex(arg4);
+
+ retval = M_TransKeyVal(conn, (long)Z_LVAL_PP(arg2), Z_STRVAL_PP(arg3),
Z_STRVAL_PP(arg4));
+
+ RETURN_LONG(retval);
+}
+/* }}} */
+#endif
+
/* {{{ proto int m_transparam(resource conn, long identifier, int key, ...)
- Add a parameter to a transaction */
+ Add a parameter to a transaction (deprecated) */
PHP_FUNCTION(m_transparam)
{
MCVE_CONN *conn;
@@ -1076,7 +1130,7 @@
PHP_FUNCTION(m_responseparam)
{
MCVE_CONN *conn;
- char *retval;
+ const char *retval;
zval **arg1, **arg2, **arg3;
if (ZEND_NUM_ARGS() != 3 ||
@@ -1093,7 +1147,7 @@
if (retval == NULL) {
RETVAL_STRING(,1);
} else {
- RETVAL_STRING(retval, 1);
+ RETVAL_STRING(estrdup(retval), 0);
}
}
/* }}} */
@@ -1103,7 +1157,7 @@
PHP_FUNCTION(m_getuserparam)
{
MCVE_CONN *conn;
- char *retval;
+ const char *retval;
zval **arg1, **arg2, **arg3;
if (ZEND_NUM_ARGS() != 3 ||
@@ -1120,7 +1174,7 @@
if (retval == NULL) {
RETVAL_STRING(,1);
} else {
-
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mcve mcve.c php_mcve.h
bradmsswMon Jun 6 12:43:54 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mcve mcve.c php_mcve.h
Log:
libmonetra 5.0 sync.
added m_validateidentifier, which is enabled by default to keep invalid
pointer addresses from causing PHP to crash
kept compatability with older versions of libmonetra.
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.28.2.2r2=1.28.2.3ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.28.2.2 php-src/ext/mcve/mcve.c:1.28.2.3
--- php-src/ext/mcve/mcve.c:1.28.2.2Sun Jan 9 16:05:16 2005
+++ php-src/ext/mcve/mcve.c Mon Jun 6 12:43:54 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mcve.c,v 1.28.2.2 2005/01/09 21:05:16 sniper Exp $ */
+/* $Id: mcve.c,v 1.28.2.3 2005/06/06 16:43:54 bradmssw Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -73,6 +73,10 @@
PHP_FE(m_connect, NULL)
PHP_FE(m_transnew, NULL)
PHP_FE(m_transparam,NULL)
+#if LIBMONETRA_VERSION = 05
+ PHP_FE(m_transkeyval, NULL)
+ PHP_FE(m_validateidentifier,NULL)
+#endif
PHP_FE(m_transsend, NULL)
PHP_FE(m_ping, NULL)
PHP_FE(m_responseparam, NULL)
@@ -550,7 +554,7 @@
PHP_MINFO_FUNCTION(mcve)
{
php_info_print_table_start();
- php_info_print_table_row(2, mcve support, enabled);
+ php_info_print_table_row(2, mcve/monetra support, enabled);
php_info_print_table_row(2, version, PHP_MCVE_VERSION);
php_info_print_table_end();
}
@@ -589,6 +593,11 @@
MCVE_InitConn(conn);
+/* Since the identifiers are pointer addresses, we need to validate it by
+ * checking our linked list in PHP, since we don't want to cause segfaults */
+#if LIBMONETRA_VERSION = 05
+ M_ValidateIdentifier(conn, 1);
+#endif
ZEND_REGISTER_RESOURCE(return_value, conn, le_conn);
}
/* }}} */
@@ -890,7 +899,7 @@
PHP_FUNCTION(m_connectionerror)
{
MCVE_CONN *conn;
- char *retval;
+ const char *retval;
zval **arg;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE)
@@ -903,7 +912,7 @@
if (retval == NULL) {
RETVAL_STRING(,1);
} else {
- RETVAL_STRING(retval, 1);
+ RETVAL_STRING(estrdup(retval), 0);
}
}
/* }}} */
@@ -965,8 +974,53 @@
}
/* }}} */
+#if LIBMONETRA_VERSION = 05
+/* {{{ proto int m_validateidentifier(resource conn, int tf)
+ Whether or not to validate the passed identifier on any transaction it is
passed to
+*/
+PHP_FUNCTION(m_validateidentifier)
+{
+ MCVE_CONN *conn;
+ int retval;
+ zval **arg1, **arg2;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, arg1, arg2) ==
FAILURE)
+ WRONG_PARAM_COUNT;
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, mcve connection,
le_conn);
+
+ convert_to_long_ex(arg2);
+ retval = M_ValidateIdentifier(conn, (int)Z_LVAL_PP(arg2));
+ RETURN_LONG(retval);
+}
+/* }}} */
+
+/* {{{ proto int m_transkeyval(resource conn, long identifier, string key,
string value)
+ Add key/value pair to a transaction. Replaces deprecated transparam() */
+PHP_FUNCTION(m_transkeyval)
+{
+ MCVE_CONN *conn;
+ int retval;
+ zval **arg1, **arg2, **arg3, **arg4;
+
+ if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, arg1, arg2,
arg3, arg4) == FAILURE)
+ WRONG_PARAM_COUNT;
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, mcve connection,
le_conn);
+
+ convert_to_long_ex(arg2);
+ convert_to_string_ex(arg3);
+ convert_to_string_ex(arg4);
+
+ retval = M_TransKeyVal(conn, (long)Z_LVAL_PP(arg2), Z_STRVAL_PP(arg3),
Z_STRVAL_PP(arg4));
+
+ RETURN_LONG(retval);
+}
+/* }}} */
+#endif
+
/* {{{ proto int m_transparam(resource conn, long identifier, int key, ...)
- Add a parameter to a transaction */
+ Add a parameter to a transaction (deprecated) */
PHP_FUNCTION(m_transparam)
{
MCVE_CONN *conn;
@@ -1076,7 +1130,7 @@
PHP_FUNCTION(m_responseparam)
{
MCVE_CONN *conn;
- char *retval;
+ const char *retval;
zval **arg1, **arg2, **arg3;
if (ZEND_NUM_ARGS() != 3 ||
@@ -1093,7 +1147,7 @@
if (retval == NULL) {
RETVAL_STRING(,1);
} else {
- RETVAL_STRING(retval, 1);
+ RETVAL_STRING(estrdup(retval), 0);
}
}
/* }}} */
@@ -1103,7 +1157,7 @@
PHP_FUNCTION(m_getuserparam)
{
MCVE_CONN *conn;
- char *retval;
+ const char *retval;
zval **arg1, **arg2, **arg3;
if (ZEND_NUM_ARGS() != 3 ||
@@ -1120,7 +1174,7 @@
if (retval == NULL) {
RETVAL_STRING(,1);
[PHP-CVS] cvs: CVSROOT / avail
wez Mon Jun 6 13:46:17 2005 EDT Modified files: /CVSROOTavail Log: tighten up PDO_ODBC and IBM DB2 commit access. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.981r2=1.982ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.981 CVSROOT/avail:1.982 --- CVSROOT/avail:1.981 Sun Jun 5 13:43:03 2005 +++ CVSROOT/avail Mon Jun 6 13:46:15 2005 @@ -276,4 +276,13 @@ # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www +# DB2 and PDO_ODBC have tighter restrictions, so that IBM are not overly +# legally encumbered. If you have contributions for these two extensions, +# please contact the lead developers. This is a temporary measure until +# we can put in place a more general process. +unavail||pecl/ibm_db2,pecl/pdo_odbc,ext/pdo_odbc +avail|dbs,skoduru|pecl/ibm_db2 +avail|wez|pecl/pdo_odbc + + # :vim: set ft=sh -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
sniper Mon Jun 6 18:01:43 2005 EDT
Modified files:
/php-src/main main.c
Log:
silence warning
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.629r2=1.630ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.629 php-src/main/main.c:1.630
--- php-src/main/main.c:1.629 Sun Jun 5 21:51:46 2005
+++ php-src/main/main.c Mon Jun 6 18:01:41 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.629 2005/06/06 01:51:46 wez Exp $ */
+/* $Id: main.c,v 1.630 2005/06/06 22:01:41 sniper Exp $ */
/* {{{ includes
*/
@@ -835,10 +835,12 @@
}
/* }}} */
+#if wez_0
static void stream_closer_for_zend(void *handle TSRMLS_DC)
{
php_stream_close((php_stream*)handle);
}
+#endif
static long stream_fteller_for_zend(void *handle TSRMLS_DC)
{
--
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/posix config.m4 posix.c
wez Mon Jun 6 18:06:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/posix config.m4 posix.c
Log:
mfh: fix solaris build
http://cvs.php.net/diff.php/php-src/ext/posix/config.m4?r1=1.7.14.1r2=1.7.14.2ty=u
Index: php-src/ext/posix/config.m4
diff -u php-src/ext/posix/config.m4:1.7.14.1
php-src/ext/posix/config.m4:1.7.14.2
--- php-src/ext/posix/config.m4:1.7.14.1Mon May 9 08:16:11 2005
+++ php-src/ext/posix/config.m4 Mon Jun 6 18:06:00 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.7.14.1 2005/05/09 12:16:11 sniper Exp $
+dnl $Id: config.m4,v 1.7.14.2 2005/06/06 22:06:00 wez Exp $
dnl
PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
@@ -9,5 +9,7 @@
AC_DEFINE(HAVE_POSIX, 1, [whether to include POSIX-like functions])
PHP_NEW_EXTENSION(posix, posix.c, $ext_shared)
- AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo
getrlimit getlogin getgroups)
+ AC_CHECK_HEADERS(sys/mkdev.h)
+
+ AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo
mknod getrlimit getlogin getgroups)
fi
http://cvs.php.net/diff.php/php-src/ext/posix/posix.c?r1=1.60.2.3r2=1.60.2.4ty=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.60.2.3 php-src/ext/posix/posix.c:1.60.2.4
--- php-src/ext/posix/posix.c:1.60.2.3 Mon May 9 08:16:11 2005
+++ php-src/ext/posix/posix.c Mon Jun 6 18:06:00 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.60.2.3 2005/05/09 12:16:11 sniper Exp $ */
+/* $Id: posix.c,v 1.60.2.4 2005/06/06 22:06:00 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -44,6 +44,9 @@
#include errno.h
#include grp.h
#include pwd.h
+#if HAVE_SYS_MKDEV_H
+# include sys/mkdev.h
+#endif
ZEND_DECLARE_MODULE_GLOBALS(posix)
@@ -135,7 +138,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, Revision, $Revision: 1.60.2.3 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.60.2.4 $);
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
Excuse me, but what's the point with this change: - RETVAL_STRING(retval, 1); + RETVAL_STRING(estrdup(retval), 0); The second parameter '1' will duplicate the value? --Jani On Mon, 6 Jun 2005, Brad House wrote: bradmsswMon Jun 6 12:43:23 2005 EDT Modified files: /php-src/ext/mcvemcve.c php_mcve.h Log: libmonetra-5.0 sync. added m_validateidentifier, which is enabled by default to keep invalid pointer addresses from causing PHP to crash kept compatability with older versions of libmonetra. -- Donate @ http://pecl.php.net/wishlist.php/sniper -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main main.c
Hello Jani,
Tuesday, June 7, 2005, 12:01:43 AM, you wrote:
sniper Mon Jun 6 18:01:43 2005 EDT
Modified files:
/php-src/main main.c
Log:
silence warning
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.629r2=1.630ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.629 php-src/main/main.c:1.630
--- php-src/main/main.c:1.629 Sun Jun 5 21:51:46 2005
+++ php-src/main/main.c Mon Jun 6 18:01:41 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.629 2005/06/06 01:51:46 wez Exp $ */
+/* $Id: main.c,v 1.630 2005/06/06 22:01:41 sniper Exp $ */
/* {{{ includes
*/
@@ -835,10 +835,12 @@
}
/* }}} */
+#if wez_0
i thought we were supposed to put the name of the one disabling it here
so that it should be #if jani_0 and not the name of the one providing the
superflous source like you did.
static void stream_closer_for_zend(void *handle TSRMLS_DC)
{
php_stream_close((php_stream*)handle);
}
+#endif
static long stream_fteller_for_zend(void *handle TSRMLS_DC)
{
--
Best regards,
Marcusmailto:[EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / commitinfo.pl
wez Mon Jun 6 20:00:15 2005 EDT
Modified files:
/CVSROOTcommitinfo.pl
Log:
Deny commits to PHP_4_3 branch.
This is dependent on a patched version of CVS; we run the patched version only
for commits over pserver, so people with shell on the cvs machine can still
commit to the 4.3 branch if they really need to.
http://cvs.php.net/diff.php/CVSROOT/commitinfo.pl?r1=1.8r2=1.9ty=u
Index: CVSROOT/commitinfo.pl
diff -u CVSROOT/commitinfo.pl:1.8 CVSROOT/commitinfo.pl:1.9
--- CVSROOT/commitinfo.pl:1.8 Sat Oct 16 18:06:03 2004
+++ CVSROOT/commitinfo.pl Mon Jun 6 20:00:14 2005
@@ -18,6 +18,11 @@
exit 1;
}
+if ($ENV{'ACL_PHP_4_3'} eq 'PHP_4_3') {
+ print This branch is closed, used PHP_4_4 instead.\n;
+ exit 1;
+}
+
open(FC, $last_file.$id) || die cannot open last file;
print FC $directory\n;
close(FC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / commitinfo.pl
wez Mon Jun 6 20:00:38 2005 EDT
Modified files:
/CVSROOTcommitinfo.pl
Log:
fix typo
http://cvs.php.net/diff.php/CVSROOT/commitinfo.pl?r1=1.9r2=1.10ty=u
Index: CVSROOT/commitinfo.pl
diff -u CVSROOT/commitinfo.pl:1.9 CVSROOT/commitinfo.pl:1.10
--- CVSROOT/commitinfo.pl:1.9 Mon Jun 6 20:00:14 2005
+++ CVSROOT/commitinfo.pl Mon Jun 6 20:00:38 2005
@@ -19,7 +19,7 @@
}
if ($ENV{'ACL_PHP_4_3'} eq 'PHP_4_3') {
- print This branch is closed, used PHP_4_4 instead.\n;
+ print This branch is closed, use PHP_4_4 instead.\n;
exit 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
