[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/phar/tests rename_dir.phpt rmdir.phpt /ext/phar/tests/tar rename_dir.phpt rmdir.phpt /ext/phar/tests/zip rename_dir.phpt rmdir.phpt
Dmitry Stogov wrote: dmitry Thu Jul 10 14:27:21 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/phar/tests rename_dir.phpt rmdir.phpt /php-src/ext/phar/tests/tar rename_dir.phpt rmdir.phpt /php-src/ext/phar/tests/zip rename_dir.phpt rmdir.phpt Log: Added tests that demonstrate serious PHAR errors They cannot be easly fixed without algorithms modification Hi Dmitry, These tests all demonstrate modification of virtual directories, i.e. directories that are not really in the archive as entries, but simply are part of a path of existing files. However, I think we can easily add support for this by adding an iteration loop at the end of phar_wrapper_rename and phar_wrapper_rmdir implementations that cycles over all of the files and renames their directories. It would be slow, but truth be told, this is only going to be done on phar construction anyways, so performance is not a huge issue there. There is a similar loop that can be cut/pasted from phar_make_dirstream in phar/dirstream.c that scans all files to find matches that are in the requested directory. With slight modification to the loop the tests will pass (i.e. instead of adding the file to the opendir hash, perform the rename of the directory portion of the filename using a clever spprintf and a few temporary null bytes at directory separator boundaries in the original file, then zend_hash_add a new entry and either remove the old one or mark it deleted if it has open refcounts). The rmdir implementation should simply fail if any file or directory exists in the virtual directory. If no one fixes this by August 13 or so, I will try my hand at it. Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8.c
sixdThu Jul 17 00:36:02 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 oci8.c Log: Allow PECL builds with PHP 4. No MTH needed http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.18&r2=1.269.2.16.2.38.2.19&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.18 php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.19 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.18Wed Jul 16 23:55:13 2008 +++ php-src/ext/oci8/oci8.c Thu Jul 17 00:36:02 2008 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.269.2.16.2.38.2.18 2008/07/16 23:55:13 sixd Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.38.2.19 2008/07/17 00:36:02 sixd Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -112,6 +112,8 @@ #endif /* COMPILE_DL */ /* }}} */ +#ifdef ZEND_ENGINE_2 + /* {{{ Function arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3) @@ -664,6 +666,108 @@ ZEND_END_ARG_INFO() /* }}} */ +#else /* ZEND_ENGINE_2 */ +/* {{{ Keep the old arginfo behavior when building with PHP 4 */ + +static unsigned char arginfo_ocifetchinto[] = { 2, BYREF_NONE, BYREF_FORCE }; +static unsigned char arginfo_oci_fetch_all[] = { 2, BYREF_NONE, BYREF_FORCE }; +static unsigned char arginfo_oci_define_by_name[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; +static unsigned char arginfo_oci_bind_by_name[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; +static unsigned char arginfo_oci_bind_array_by_name[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; + +#define arginfo_oci_free_descriptor NULL +#define arginfo_oci_lob_save NULL +#define arginfo_oci_lob_import NULL +#define arginfo_oci_lob_load NULL +#define arginfo_oci_lob_read NULL +#define arginfo_oci_lob_eof NULL +#define arginfo_oci_lob_tell NULL +#define arginfo_oci_lob_rewind NULL +#define arginfo_oci_lob_seek NULL +#define arginfo_oci_lob_size NULL +#define arginfo_oci_lob_write NULL +#define arginfo_oci_lob_append NULL +#define arginfo_oci_lob_truncate NULL +#define arginfo_oci_lob_erase NULL +#define arginfo_oci_lob_flush NULL +#define arginfo_ocisetbufferinglob NULL +#define arginfo_ocigetbufferinglob NULL +#define arginfo_oci_lob_copy NULL +#define arginfo_oci_lob_is_equal NULL +#define arginfo_oci_lob_export NULL +#define arginfo_oci_new_descriptor NULL +#define arginfo_oci_rollback NULL +#define arginfo_oci_commit NULL +#define arginfo_oci_field_name NULL +#define arginfo_oci_field_size NULL +#define arginfo_oci_field_scale NULL +#define arginfo_oci_field_precision NULL +#define arginfo_oci_field_type NULL +#define arginfo_oci_field_type_raw NULL +#define arginfo_oci_field_is_null NULL +#define arginfo_oci_internal_debug NULL +#define arginfo_oci_execute NULL +#define arginfo_oci_cancel NULL +#define arginfo_oci_fetch NULL +#define arginfo_oci_fetch_object NULL +#define arginfo_oci_fetch_row NULL +#define arginfo_oci_fetch_assoc NULL +#define arginfo_oci_fetch_array NULL +#define arginfo_oc
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8.c /ext/oci8/tests reflection1.phpt reflection2.phpt
sixdWed Jul 16 23:55:13 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/oci8/tests reflection2.phpt Modified files: /php-src/ext/oci8 oci8.c /php-src/ext/oci8/tests reflection1.phpt Log: MFH: [DOC] Add LOB & Collection class parameter reflection http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.17&r2=1.269.2.16.2.38.2.18&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.17 php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.18 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.17Wed Jul 16 22:16:03 2008 +++ php-src/ext/oci8/oci8.c Wed Jul 16 23:55:13 2008 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.269.2.16.2.38.2.17 2008/07/16 22:16:03 sixd Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.38.2.18 2008/07/16 23:55:13 sixd Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -112,7 +112,7 @@ #endif /* COMPILE_DL */ /* }}} */ -/* {{{ arginfo */ +/* {{{ Function arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3) ZEND_ARG_INFO(0, statement_resource) @@ -231,7 +231,7 @@ static ZEND_BEGIN_ARG_INFO_EX(arginfo_ocisetbufferinglob, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) - ZEND_ARG_INFO(0, flag) + ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() static @@ -475,7 +475,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append, 0, 0, ) +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append, 0, 0, 2) ZEND_ARG_INFO(0, collection) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() @@ -512,7 +512,7 @@ static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim, 0, 0, 2) ZEND_ARG_INFO(0, collection) - ZEND_ARG_INFO(0, num) + ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() static @@ -523,6 +523,147 @@ ZEND_END_ARG_INFO() /* }}} */ +/* {{{ LOB Method arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_save_method, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, offset) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_import_method, 0, 0, 1) + ZEND_ARG_INFO(0, filename) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_load_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_read_method, 0, 0, 1) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_eof_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_tell_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_rewind_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_seek_method, 0, 0, 1) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, whence) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_size_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_method, 0, 0, 1) + ZEND_ARG_INFO(0, string) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_append_method, 0, 0, 1) + ZEND_ARG_INFO(0, lob_descriptor_from) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_truncate_method, 0, 0, 0) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_erase_method, 0, 0, 0) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_flush_method, 0, 0, 0) + ZEND_ARG_INFO(0, flag) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_setbuffering_method, 0, 0, 1) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_getbuffering_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_export_method, 0, 0, 1) + ZEND_ARG_INFO(0, filename) + ZEND_ARG_INFO(0, start) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_temporary_method, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, type) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_close_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_free_descriptor_method, 0) +ZEND_END_ARG_INFO() +/* }}} */ + +/* {{{ Collection Method arginfo */ +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_free_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append_method, 0, 0, 1) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_get_method, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_assign_method, 0, 0, 1) + ZEND_AR
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c /ext/oci8/tests reflection1.phpt reflection2.phpt
sixdWed Jul 16 23:54:42 2008 UTC Added files: /php-src/ext/oci8/tests reflection2.phpt Modified files: /php-src/ext/oci8 oci8.c /php-src/ext/oci8/tests reflection1.phpt Log: Add LOB & Collection class parameter reflection http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.351&r2=1.352&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.351 php-src/ext/oci8/oci8.c:1.352 --- php-src/ext/oci8/oci8.c:1.351 Wed Jul 16 22:14:02 2008 +++ php-src/ext/oci8/oci8.c Wed Jul 16 23:54:42 2008 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.351 2008/07/16 22:14:02 sixd Exp $ */ +/* $Id: oci8.c,v 1.352 2008/07/16 23:54:42 sixd Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -104,7 +104,7 @@ #endif /* COMPILE_DL */ /* }}} */ -/* {{{ arginfo */ +/* {{{ Function arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3) ZEND_ARG_INFO(0, statement_resource) @@ -223,7 +223,7 @@ static ZEND_BEGIN_ARG_INFO_EX(arginfo_ocisetbufferinglob, 0, 0, 2) ZEND_ARG_INFO(0, lob_descriptor) - ZEND_ARG_INFO(0, flag) + ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() static @@ -467,7 +467,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append, 0, 0, ) +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append, 0, 0, 2) ZEND_ARG_INFO(0, collection) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() @@ -504,7 +504,7 @@ static ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim, 0, 0, 2) ZEND_ARG_INFO(0, collection) - ZEND_ARG_INFO(0, num) + ZEND_ARG_INFO(0, number) ZEND_END_ARG_INFO() static @@ -515,6 +515,147 @@ ZEND_END_ARG_INFO() /* }}} */ +/* {{{ LOB Method arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_save_method, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, offset) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_import_method, 0, 0, 1) + ZEND_ARG_INFO(0, filename) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_load_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_read_method, 0, 0, 1) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_eof_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_tell_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_rewind_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_seek_method, 0, 0, 1) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, whence) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_size_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_method, 0, 0, 1) + ZEND_ARG_INFO(0, string) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_append_method, 0, 0, 1) + ZEND_ARG_INFO(0, lob_descriptor_from) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_truncate_method, 0, 0, 0) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_erase_method, 0, 0, 0) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_flush_method, 0, 0, 0) + ZEND_ARG_INFO(0, flag) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_setbuffering_method, 0, 0, 1) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_getbuffering_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_export_method, 0, 0, 1) + ZEND_ARG_INFO(0, filename) + ZEND_ARG_INFO(0, start) + ZEND_ARG_INFO(0, length) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_temporary_method, 0, 0, 1) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, type) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_close_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_free_descriptor_method, 0) +ZEND_END_ARG_INFO() +/* }}} */ + +/* {{{ Collection Method arginfo */ +static +ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_free_method, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append_method, 0, 0, 1) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_get_method, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_assign_method, 0, 0, 1) + ZEND_ARG_INFO(0, collection_from) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_assign_method, 0, 0, 2
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring php_mbregex.h
hirokawaWed Jul 16 22:56:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring php_mbregex.h Log: revert my previous patch. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.h?r1=1.12.2.1.2.1.2.5&r2=1.12.2.1.2.1.2.6&diff_format=u Index: php-src/ext/mbstring/php_mbregex.h diff -u php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.5 php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.6 --- php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.5 Wed Jul 16 12:21:46 2008 +++ php-src/ext/mbstring/php_mbregex.h Wed Jul 16 22:56:56 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.5 2008/07/16 12:21:46 hirokawa Exp $ */ +/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.6 2008/07/16 22:56:56 hirokawa Exp $ */ #ifndef _PHP_MBREGEX_H #define _PHP_MBREGEX_H @@ -26,7 +26,7 @@ #include "php.h" #include "zend.h" #include "php_onig_compat.h" /* must come prior to the oniguruma header */ -#include "oniguruma/oniguruma.h" +#include "oniguruma.h" #undef UChar /* {{{ PHP_MBREGEX_GLOBALS */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README
sfoxWed Jul 16 22:30:12 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildDSP.README Log: Update README to reflect current state of play http://cvs.php.net/viewvc.cgi/php-src/win32/build/DSP.README?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/win32/build/DSP.README diff -u php-src/win32/build/DSP.README:1.1.2.1 php-src/win32/build/DSP.README:1.1.2.2 --- php-src/win32/build/DSP.README:1.1.2.1 Wed Jul 9 08:15:46 2008 +++ php-src/win32/build/DSP.README Wed Jul 16 22:30:12 2008 @@ -1,14 +1,12 @@ MSVC++ project file generation == -The project files generated by projectgen.js are in no way intended -for building with. There is already a perfectly good Windows build -system in place. These files are only intended for use in debugging -and profiling, and are very unlikely to create working binaries. +These files are only intended for use in debugging and profiling, +but can be used to create working binaries. However, they are very +unlikely to match the official PHP distributed binaries. With this in mind, the script will only generate basic .dsp files -for the modules that are currently configured, and a single project -workspace file to rule them all. +for the modules that are currently configured. The switch for project file generation is a buildconf switch and not a configure switch: @@ -16,10 +14,11 @@ > buildconf --add-project-files > configure ... -The resulting workspace file should appear at /win32/php.dsw after -configure is run. +The resulting workspace files should appear at /win32/phpdll[ts].dsw +and (if any shared modules are configured) at /win32/php_modules.dsw, +after configure is run. -If the .dsw hasn't generated in a sane way, the most likely reason +If the .dsw files haven't generated in a sane way, the most likely reason will be that the template files have become corrupted. They need DOS line endings (CR/LF) in order to function. The affected files are: @@ -30,7 +29,7 @@ Simply save them with DOS line endings, and bug it to me if basic project file generation still fails (as in, you ran the command and configure again after saving, and you have a working copy of MSVS -installed, but clicking on the workspace doesn't give you anything). +installed, but clicking on the workspace(s) doesn't give you anything). - Steph [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build block.template.dsw projectgen.js template.dsp template.dsw
sfoxWed Jul 16 22:25:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildblock.template.dsw projectgen.js template.dsp template.dsw Log: - A bit more finesse for .dsp generation - Builds (on my box) for cgi or cli - This is still VC6-only at present http://cvs.php.net/viewvc.cgi/php-src/win32/build/block.template.dsw?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/win32/build/block.template.dsw diff -u php-src/win32/build/block.template.dsw:1.1.2.1 php-src/win32/build/block.template.dsw:1.1.2.2 --- php-src/win32/build/block.template.dsw:1.1.2.1 Wed Jul 9 08:15:46 2008 +++ php-src/win32/build/block.template.dsw Wed Jul 16 22:25:46 2008 @@ -1,3 +1,4 @@ + Project: "EXTNAME"=..\ADDRESS - Package Owner=<4> Package=<5> @@ -7,7 +8,7 @@ Package=<4> {{{ Begin Project Dependency -Project_Dep_Name main +Project_Dep_Name php5dllts End Project Dependency }}} http://cvs.php.net/viewvc.cgi/php-src/win32/build/projectgen.js?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/win32/build/projectgen.js diff -u php-src/win32/build/projectgen.js:1.1.2.3 php-src/win32/build/projectgen.js:1.1.2.4 --- php-src/win32/build/projectgen.js:1.1.2.3 Wed Jul 9 15:47:06 2008 +++ php-src/win32/build/projectgen.js Wed Jul 16 22:25:46 2008 @@ -1,12 +1,57 @@ -/* utility function to write .dsp source blocks */ -function write_src_file(fname, arr) +/* check for duplicate entries */ +function check_duplicates(local, core) { - var src = FSO.CreateTextFile(fname, true); + if (!local) { + return core; + } + + arr = local.split(" "); + + for(i = 0; i < arr.length; i++) { + if (core.match(arr[i])) { + continue; + } + core += " " + arr[i]; + } + + return core; +} + +/* read .dsp source blocks */ +function read_src_files(ext, tmpl, path) +{ + sources = file_get_contents("tmp\\src\\" + ext + ".sources.tmp"); + sources = (path ? sources.replace(/\.\//g, path) : sources); + tmpl = tmpl.replace("SOURCEFILES", sources); + FSO.DeleteFile("tmp\\src\\" + ext + ".sources.tmp"); + + headers = file_get_contents("tmp\\src\\" + ext + ".headers.tmp"); + headers = (path ? headers.replace(/\.\//g, path) : headers); + tmpl = tmpl.replace("HEADERFILES", headers); + FSO.DeleteFile("tmp\\src\\" + ext + ".headers.tmp"); + + return tmpl; +} + +/* write a .dsp source block */ +function write_src_file(fname, path, intpath, arr) +{ + FSO.FolderExists("tmp\\src") ? "" : FSO.CreateFolder("tmp\\src"); + var src = FSO.CreateTextFile("tmp\\src\\" + fname, true); + var out = get_define("BUILD_DIR"); for (i = 0; i < arr.length; i++) { if (arr[i].length > 1) { + if (arr[i].match('alloca.c') || + arr[i].match(/internal_functions_(nw|win32)\.c/) || + arr[i].match(/flock\.(c|h)/) || + arr[i].match(/zend_static_allocator\.(c|h)/) || + arr[i].match(/zend_(ini|language)_scanner_defs\.h/)) { + continue; + } src.WriteLine("# Begin Source File"); src.WriteLine("SOURCE=" + arr[i]); + src.WriteLine('# PROP Intermediate_Dir "' + intpath + out + '\\' + path + '"'); src.WriteLine("# End Source File"); src.WriteBlankLines(1); } @@ -16,74 +61,371 @@ return; } -/* final stage, all gets cleaned up here */ +/* generate list of text files */ +function generate_text_filelist(ext, ext_dir) +{ + var txtdir = FSO.GetFolder(ext_dir); + + block = '# Begin Group "Text Files"\r\n\# PROP Default_Filter ""\r\n\r\n'; + txt = new Enumerator(txtdir.Files); + + for (; !txt.atEnd(); txt.moveNext()) { + fname = FSO.GetFileName(txt.item()); + munged = fname.replace(ext, ""); /* TSRM...! */ + + if (munged.match(/[A-Z]{4}/)){ + block += "# Begin Source File\r\n"; + block += "SOURCE=./" + fname + "\r\n"; + block += "# End Source File\r\n\r\n"; + } + } + + block += "# End Group\r\n"; + return block; +} + +/* generate list of resource files */ +function generate_resource_filelist(ext, ext_dir) +{ + var resdir = FSO.GetFolder(ext_dir); + res = new Enumerator(resdir.Files); + block = ""; + + for (; !res.atEnd(); res.moveNext()) { + fname = FSO.GetFileName(res.item()); + + if (fname.match(/\.(ico|rc)/)) { + block += "# Begin Source File\r\n"; + block += "SOURCE=./" + fname + "\r\
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8/tests xmltype_01.phpt
sixdWed Jul 16 19:52:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8/tests xmltype_01.phpt Log: MFH: improve skipif http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/xmltype_01.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/oci8/tests/xmltype_01.phpt diff -u php-src/ext/oci8/tests/xmltype_01.phpt:1.1.2.1 php-src/ext/oci8/tests/xmltype_01.phpt:1.1.2.1.2.1 --- php-src/ext/oci8/tests/xmltype_01.phpt:1.1.2.1 Thu Aug 30 17:33:00 2007 +++ php-src/ext/oci8/tests/xmltype_01.phpt Wed Jul 16 19:52:01 2008 @@ -2,6 +2,7 @@ Basic XMLType test --SKIPIF-- + --FILE-- load(); var_dump($data); return($data); @@ -65,10 +66,10 @@ $s = oci_parse($c, 'update xtt set xt_spec = XMLType(:clob) where xt_id = 1'); -$lob = oci_new_descriptor($c, OCI_D_LOB); +$lob = oci_new_descriptor($c, OCI_D_LOB); oci_bind_by_name($s, ':clob', $lob, -1, OCI_B_CLOB); -$lob->writeTemporary($sx->asXml()); -oci_execute($s); +$lob->writeTemporary($sx->asXml()); +oci_execute($s); $lob->close(); // Verify -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8/tests xmltype_01.phpt
sixdWed Jul 16 19:51:54 2008 UTC Modified files: /php-src/ext/oci8/tests xmltype_01.phpt Log: improve skipif http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/xmltype_01.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/oci8/tests/xmltype_01.phpt diff -u php-src/ext/oci8/tests/xmltype_01.phpt:1.3 php-src/ext/oci8/tests/xmltype_01.phpt:1.4 --- php-src/ext/oci8/tests/xmltype_01.phpt:1.3 Tue May 27 14:30:38 2008 +++ php-src/ext/oci8/tests/xmltype_01.phpt Wed Jul 16 19:51:53 2008 @@ -2,6 +2,7 @@ Basic XMLType test --SKIPIF-- + --FILE-- load(); var_dump($data); return($data); @@ -65,10 +66,10 @@ $s = oci_parse($c, 'update xtt set xt_spec = XMLType(:clob) where xt_id = 1'); -$lob = oci_new_descriptor($c, OCI_D_LOB); +$lob = oci_new_descriptor($c, OCI_D_LOB); oci_bind_by_name($s, ':clob', $lob, -1, OCI_B_CLOB); -$lob->writeTemporary($sx->asXml()); -oci_execute($s); +$lob->writeTemporary($sx->asXml()); +oci_execute($s); $lob->close(); // Verify -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pspell pspell.c
felipe Wed Jul 16 18:35:41 2008 UTC Modified files: /php-src/ext/pspell pspell.c Log: - MFB: Added arginfo http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/pspell.c?r1=1.60&r2=1.61&diff_format=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.60 php-src/ext/pspell/pspell.c:1.61 --- php-src/ext/pspell/pspell.c:1.60Mon Dec 31 07:12:13 2007 +++ php-src/ext/pspell/pspell.c Wed Jul 16 18:35:41 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pspell.c,v 1.60 2007/12/31 07:12:13 sebastian Exp $ */ +/* $Id: pspell.c,v 1.61 2008/07/16 18:35:41 felipe Exp $ */ #define IS_EXT_MODULE @@ -72,28 +72,151 @@ static PHP_FUNCTION(pspell_config_repl); static PHP_FUNCTION(pspell_config_save_repl); +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new, 0, 0, 1) + ZEND_ARG_INFO(0, language) + ZEND_ARG_INFO(0, spelling) + ZEND_ARG_INFO(0, jargon) + ZEND_ARG_INFO(0, encoding) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_personal, 0, 0, 2) + ZEND_ARG_INFO(0, personal) + ZEND_ARG_INFO(0, language) + ZEND_ARG_INFO(0, spelling) + ZEND_ARG_INFO(0, jargon) + ZEND_ARG_INFO(0, encoding) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_config, 0, 0, 1) + ZEND_ARG_INFO(0, config) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_check, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_suggest, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_store_replacement, 0, 0, 3) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, misspell) + ZEND_ARG_INFO(0, correct) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_personal, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_session, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_clear_session, 0, 0, 1) + ZEND_ARG_INFO(0, pspell) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_save_wordlist, 0, 0, 1) + ZEND_ARG_INFO(0, pspell) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_create, 0, 0, 1) + ZEND_ARG_INFO(0, language) + ZEND_ARG_INFO(0, spelling) + ZEND_ARG_INFO(0, jargon) + ZEND_ARG_INFO(0, encoding) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_runtogether, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, runtogether) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_mode, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_ignore, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, ignore) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_personal, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, personal) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_dict_dir, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, directory) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_data_dir, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, directory) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_repl, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, repl) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_save_repl, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, save) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ pspell_functions[] */ -const zend_function_entry pspell_functions[] = { - PHP_FE(pspell_new, NULL) - PHP_FE(pspell_new_personal, NULL) - PHP_FE(pspell_new_config, NULL) - PHP_FE(pspell_check,NULL) - PHP_FE(pspell_suggest, NULL) - PHP_FE(pspell_store_replacement,NULL) - PHP_FE(pspell_add_to_personal, NULL) - PHP_FE(pspell_add_to_session, NULL) - PHP_FE(pspell_clear_session,NULL) - PHP_FE(pspell_save_wordlist,NULL) - PHP_FE(pspell_config_create,NULL) - PHP_FE(pspell_config_runtogether, NULL) - PHP_FE(pspell_config_mode, NULL) - PHP_FE(pspell_config_ignore,NULL) - PHP_FE(pspell_config_personal,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pspell pspell.c
felipe Wed Jul 16 18:34:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pspell pspell.c Log: - Added arginfo http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/pspell.c?r1=1.45.2.4.2.7.2.3&r2=1.45.2.4.2.7.2.4&diff_format=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.45.2.4.2.7.2.3 php-src/ext/pspell/pspell.c:1.45.2.4.2.7.2.4 --- php-src/ext/pspell/pspell.c:1.45.2.4.2.7.2.3Fri Jun 27 02:58:12 2008 +++ php-src/ext/pspell/pspell.c Wed Jul 16 18:34:56 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pspell.c,v 1.45.2.4.2.7.2.3 2008/06/27 02:58:12 felipe Exp $ */ +/* $Id: pspell.c,v 1.45.2.4.2.7.2.4 2008/07/16 18:34:56 felipe Exp $ */ #define IS_EXT_MODULE @@ -72,28 +72,151 @@ static PHP_FUNCTION(pspell_config_repl); static PHP_FUNCTION(pspell_config_save_repl); +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new, 0, 0, 1) + ZEND_ARG_INFO(0, language) + ZEND_ARG_INFO(0, spelling) + ZEND_ARG_INFO(0, jargon) + ZEND_ARG_INFO(0, encoding) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_personal, 0, 0, 2) + ZEND_ARG_INFO(0, personal) + ZEND_ARG_INFO(0, language) + ZEND_ARG_INFO(0, spelling) + ZEND_ARG_INFO(0, jargon) + ZEND_ARG_INFO(0, encoding) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_config, 0, 0, 1) + ZEND_ARG_INFO(0, config) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_check, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_suggest, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_store_replacement, 0, 0, 3) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, misspell) + ZEND_ARG_INFO(0, correct) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_personal, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_session, 0, 0, 2) + ZEND_ARG_INFO(0, pspell) + ZEND_ARG_INFO(0, word) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_clear_session, 0, 0, 1) + ZEND_ARG_INFO(0, pspell) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_save_wordlist, 0, 0, 1) + ZEND_ARG_INFO(0, pspell) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_create, 0, 0, 1) + ZEND_ARG_INFO(0, language) + ZEND_ARG_INFO(0, spelling) + ZEND_ARG_INFO(0, jargon) + ZEND_ARG_INFO(0, encoding) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_runtogether, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, runtogether) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_mode, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, mode) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_ignore, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, ignore) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_personal, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, personal) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_dict_dir, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, directory) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_data_dir, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, directory) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_repl, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, repl) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_save_repl, 0, 0, 2) + ZEND_ARG_INFO(0, conf) + ZEND_ARG_INFO(0, save) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ pspell_functions[] */ static const zend_function_entry pspell_functions[] = { - PHP_FE(pspell_new, NULL) - PHP_FE(pspell_new_personal, NULL) - PHP_FE(pspell_new_config, NULL) - PHP_FE(pspell_check,NULL) - PHP_FE(pspell_suggest, NULL) - PHP_FE(pspell_store_replacement,NULL) - PHP_FE(pspell_add_to_personal, NULL) - PHP_FE(pspell_add_to_session, NULL) - PHP_FE(pspell_clear_session,NULL) - PHP_FE(pspell_save_wordlist,NULL) - PHP_FE(pspell_config_create,NULL) - PHP_FE(pspell_config_runtogether, NULL) - PHP_FE(pspell_config_mode,
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring php_mbregex.h
On Wed, Jul 16, 2008 at 6:21 PM, Moriyoshi Koizumi <[EMAIL PROTECTED]> wrote: > Hi Pierre, > > Pierre Joye wrote: > >> You can always ask us to test/fix :) >> >> Or you can use for the cases where only unix is affected: > >> #ifndef PHP_WIN32 >> do your unix only stuff >> #endif > > Thanks for the tips. I'll try my patch in the Windows box next time... just > like I used to do. :-) > BTW, it almost looks like you already forgot who I was.. :) > (I got my karma 5 or 6 years ago. really.) I was more pointing you to some possible new help: http://wiki.php.net/internals/windows :-) -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Wed Jul 16 16:37:46 2008 UTC Modified files: /CVSROOTavail Log: - akshat karma http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1421&r2=1.1422&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1421 CVSROOT/avail:1.1422 --- CVSROOT/avail:1.1421Wed Jul 9 15:12:47 2008 +++ CVSROOT/avail Wed Jul 16 16:37:46 2008 @@ -292,6 +292,7 @@ avail|graham|pecl/optimizer avail|joonas|pecl/llvm avail|indeyets|pecl/spread +avail|akshat|pecl/cairo # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in
janiWed Jul 16 16:30:05 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in Log: -nuke weird char http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.99&r2=1.579.2.52.2.100&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.99 php-src/configure.in:1.579.2.52.2.100 --- php-src/configure.in:1.579.2.52.2.99Wed Jul 16 16:23:59 2008 +++ php-src/configure.inWed Jul 16 16:30:04 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.99 2008/07/16 16:23:59 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.100 2008/07/16 16:30:04 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -154,7 +154,7 @@ dnl Check if bison generated files exist when bison does not.. case $php_cv_bison_version in ""|invalid[)] -if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) 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_3) / configure.in
janiWed Jul 16 16:29:37 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: -nuke weird char http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.22&r2=1.579.2.52.2.77.2.23&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.22 php-src/configure.in:1.579.2.52.2.77.2.23 --- php-src/configure.in:1.579.2.52.2.77.2.22 Wed Jul 16 16:22:43 2008 +++ php-src/configure.inWed Jul 16 16:29:37 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.22 2008/07/16 16:22:43 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.23 2008/07/16 16:29:37 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -168,7 +168,7 @@ dnl Check if bison generated files exist when bison does not.. case $php_cv_bison_version in ""|invalid[)] -if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) fi ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiWed Jul 16 16:29:13 2008 UTC Modified files: /php-srcconfigure.in Log: -nuke weird char http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.659&r2=1.660&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.659 php-src/configure.in:1.660 --- php-src/configure.in:1.659 Wed Jul 16 16:22:32 2008 +++ php-src/configure.inWed Jul 16 16:29:13 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.659 2008/07/16 16:22:32 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.660 2008/07/16 16:29:13 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -169,7 +169,7 @@ dnl Check if bison generated files exist when bison does not.. case $php_cv_bison_version in ""|invalid[)] -if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) fi ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in
janiWed Jul 16 16:24:00 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in Log: MFH:- Prevent errors in CVS builds when bison is not there (for Sean :) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.98&r2=1.579.2.52.2.99&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.98 php-src/configure.in:1.579.2.52.2.99 --- php-src/configure.in:1.579.2.52.2.98Wed Apr 30 18:33:33 2008 +++ php-src/configure.inWed Jul 16 16:23:59 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.98 2008/04/30 18:33:33 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.99 2008/07/16 16:23:59 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -151,6 +151,15 @@ PHP_PROG_BISON PHP_PROG_LEX +dnl Check if bison generated files exist when bison does not.. +case $php_cv_bison_version in + ""|invalid[)] +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then + AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) +fi +;; +esac + dnl Platform-specific compile settings. dnl - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / configure.in
janiWed Jul 16 16:22:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: MFH:- Prevent errors in CVS builds when bison is not there (for Sean :) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.21&r2=1.579.2.52.2.77.2.22&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.21 php-src/configure.in:1.579.2.52.2.77.2.22 --- php-src/configure.in:1.579.2.52.2.77.2.21 Mon Jul 14 09:48:58 2008 +++ php-src/configure.inWed Jul 16 16:22:43 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.21 2008/07/14 09:48:58 dmitry Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.22 2008/07/16 16:22:43 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -165,6 +165,15 @@ PHP_PROG_BISON PHP_PROG_RE2C +dnl Check if bison generated files exist when bison does not.. +case $php_cv_bison_version in + ""|invalid[)] +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then + AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) +fi +;; +esac + PHP_ARG_ENABLE(re2c-cgoto, whether to enable computed goto gcc extension with re2c, [ --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension], no, no) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiWed Jul 16 16:22:32 2008 UTC Modified files: /php-srcconfigure.in Log: - Prevent errors in CVS builds when bison is not there (for Sean :) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.658&r2=1.659&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.658 php-src/configure.in:1.659 --- php-src/configure.in:1.658 Tue Jul 8 07:05:03 2008 +++ php-src/configure.inWed Jul 16 16:22:32 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.658 2008/07/08 07:05:03 dmitry Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.659 2008/07/16 16:22:32 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -166,6 +166,15 @@ PHP_PROG_BISON PHP_PROG_RE2C +dnl Check if bison generated files exist when bison does not.. +case $php_cv_bison_version in + ""|invalid[)] +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then + AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) +fi +;; +esac + PHP_ARG_ENABLE(re2c-cgoto, whether to enable computed goto gcc extension with re2c, [ --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension], no, no) -- 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_3) /ext/mbstring php_mbregex.h
Hi Pierre, Pierre Joye wrote: You can always ask us to test/fix :) Or you can use for the cases where only unix is affected: #ifndef PHP_WIN32 do your unix only stuff #endif Thanks for the tips. I'll try my patch in the Windows box next time... just like I used to do. BTW, it almost looks like you already forgot who I was.. :) (I got my karma 5 or 6 years ago. really.) Moriyoshi -- 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_3) /ext/mbstring php_mbregex.h
On Wed, Jul 16, 2008 at 5:50 PM, Moriyoshi Koizumi <[EMAIL PROTECTED]> wrote: > Rui Hirokawa wrote: >> hirokawa Wed Jul 16 12:21:46 2008 UTC >> >> Modified files: (Branch: PHP_5_3) >> /php-src/ext/mbstring php_mbregex.h >> Log: >> fixed compile error on Win32 environment. > >> #include "php_onig_compat.h" /* must come prior to the oniguruma > header */ >> -#include "oniguruma.h" >> +#include "oniguruma/oniguruma.h" > > Sorry for not caring about the Windows build, but that change > of the header path is intentional, to support external > oniguruma installation. You can always ask us to test/fix :) Or you can use for the cases where only unix is affected: #ifndef PHP_WIN32 do your unix only stuff #endif Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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_3) /ext/mbstring php_mbregex.h
Rui Hirokawa wrote: > hirokawa Wed Jul 16 12:21:46 2008 UTC > > Modified files: (Branch: PHP_5_3) > /php-src/ext/mbstring php_mbregex.h > Log: > fixed compile error on Win32 environment. > #include "php_onig_compat.h" /* must come prior to the oniguruma header */ > -#include "oniguruma.h" > +#include "oniguruma/oniguruma.h" Sorry for not caring about the Windows build, but that change of the header path is intentional, to support external oniguruma installation. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests bug45529.phpt
derick Wed Jul 16 15:42:13 2008 UTC Modified files: /php-src/ext/date/tests bug45529.phpt Log: - Added missing test-file. http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug45529.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/bug45529.phpt diff -u /dev/null php-src/ext/date/tests/bug45529.phpt:1.2 --- /dev/null Wed Jul 16 15:42:13 2008 +++ php-src/ext/date/tests/bug45529.phptWed Jul 16 15:42:13 2008 @@ -0,0 +1,20 @@ +--TEST-- +Bug #45529 (UTC not properly recognised as timezone identifier while parsing) +--FILE-- +getTimeZone(); +echo $tz1->getName(), PHP_EOL; +echo $tz2->getName(), PHP_EOL; +$d = new DateTime('2008-01-01 12:00:00+0200'); +$d->setTimeZone($tz1); +echo $d->format(DATE_ISO8601), PHP_EOL; +$d = new DateTime('2008-01-01 12:00:00+0200'); +$d->setTimeZone($tz2); +echo $d->format(DATE_ISO8601), PHP_EOL; +?> +--EXPECT-- +UTC +UTC +2008-01-01T10:00:00+ +2008-01-01T10:00:00+ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
pajoye Wed Jul 16 15:41:58 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: - fix the fix http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.29&r2=1.226.2.37.2.35.2.30&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.29 php-src/run-tests.php:1.226.2.37.2.35.2.30 --- php-src/run-tests.php:1.226.2.37.2.35.2.29 Tue Jul 8 18:18:08 2008 +++ php-src/run-tests.php Wed Jul 16 15:41:58 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.29 2008/07/08 18:18:08 nlopess Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.30 2008/07/16 15:41:58 pajoye Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -449,7 +449,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.29 $'."\n"; + echo '$Revision: 1.226.2.37.2.35.2.30 $'."\n"; exit(1); case 'u': @@ -552,7 +552,7 @@ } if (strlen($conf_passed)) { - if (substr(PHP_OS, 0, 3) != "WIN") { + if (substr(PHP_OS, 0, 3) == "WIN") { $pass_options .= " -c " . escapeshellarg($conf_passed); } else { $pass_options .= " -c '$conf_passed'"; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib parse_date.c parse_date.re /ext/date/tests bug45529.phpt
derick Wed Jul 16 15:41:15 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/date/tests bug45529.phpt Modified files: /php-src/ext/date/lib parse_date.c parse_date.re Log: - MFH: Fixed bug #45529 (new DateTimeZone() and date_create()->getTimezone() behave different). http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.21&r2=1.29.2.30.2.14.2.22&diff_format=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.21 php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.22 --- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.21 Tue Jul 15 17:38:07 2008 +++ php-src/ext/date/lib/parse_date.c Wed Jul 16 15:40:41 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Tue Jul 15 19:21:36 2008 */ +/* Generated by re2c 0.13.5 on Wed Jul 16 17:24:19 2008 */ #line 1 "ext/date/lib/parse_date.re" /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: parse_date.c,v 1.29.2.30.2.14.2.21 2008/07/15 17:38:07 derick Exp $ */ +/* $Id: parse_date.c,v 1.29.2.30.2.14.2.22 2008/07/16 15:40:41 derick Exp $ */ #include "timelib.h" @@ -800,7 +800,7 @@ } #endif /* If we have a TimeZone identifier to start with, use it */ - if (strstr(tz_abbr, "/")) { + if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { t->tz_info = res; t->zone_type = TIMELIB_ZONETYPE_ID; http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.27.2.12.2.19&r2=1.26.2.27.2.12.2.20&diff_format=u Index: php-src/ext/date/lib/parse_date.re diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.19 php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.20 --- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.19 Tue Jul 15 17:38:27 2008 +++ php-src/ext/date/lib/parse_date.re Wed Jul 16 15:41:01 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: parse_date.re,v 1.26.2.27.2.12.2.19 2008/07/15 17:38:27 derick Exp $ */ +/* $Id: parse_date.re,v 1.26.2.27.2.12.2.20 2008/07/16 15:41:01 derick Exp $ */ #include "timelib.h" @@ -798,7 +798,7 @@ } #endif /* If we have a TimeZone identifier to start with, use it */ - if (strstr(tz_abbr, "/")) { + if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { t->tz_info = res; t->zone_type = TIMELIB_ZONETYPE_ID; http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug45529.phpt?view=markup&rev=1.1 Index: php-src/ext/date/tests/bug45529.phpt +++ php-src/ext/date/tests/bug45529.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re
derick Wed Jul 16 15:40:01 2008 UTC Modified files: /php-src/ext/date/lib parse_date.c parse_date.re Log: - Fixed bug #45529 (new DateTimeZone() and date_create()->getTimezone() behave different). http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.94&r2=1.95&diff_format=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.94 php-src/ext/date/lib/parse_date.c:1.95 --- php-src/ext/date/lib/parse_date.c:1.94 Tue Jul 15 17:37:32 2008 +++ php-src/ext/date/lib/parse_date.c Wed Jul 16 15:40:00 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Tue Jul 15 19:35:53 2008 */ +/* Generated by re2c 0.13.5 on Wed Jul 16 17:39:20 2008 */ #line 1 "ext/date/lib/parse_date.re" /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: parse_date.c,v 1.94 2008/07/15 17:37:32 derick Exp $ */ +/* $Id: parse_date.c,v 1.95 2008/07/16 15:40:00 derick Exp $ */ #include "timelib.h" @@ -800,7 +800,7 @@ } #endif /* If we have a TimeZone identifier to start with, use it */ - if (strstr(tz_abbr, "/")) { + if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { t->tz_info = res; t->zone_type = TIMELIB_ZONETYPE_ID; http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.85&r2=1.86&diff_format=u Index: php-src/ext/date/lib/parse_date.re diff -u php-src/ext/date/lib/parse_date.re:1.85 php-src/ext/date/lib/parse_date.re:1.86 --- php-src/ext/date/lib/parse_date.re:1.85 Tue Jul 15 17:37:33 2008 +++ php-src/ext/date/lib/parse_date.re Wed Jul 16 15:40:01 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: parse_date.re,v 1.85 2008/07/15 17:37:33 derick Exp $ */ +/* $Id: parse_date.re,v 1.86 2008/07/16 15:40:01 derick Exp $ */ #include "timelib.h" @@ -798,7 +798,7 @@ } #endif /* If we have a TimeZone identifier to start with, use it */ - if (strstr(tz_abbr, "/")) { + if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { t->tz_info = res; t->zone_type = TIMELIB_ZONETYPE_ID; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c
dmitry Wed Jul 16 15:09:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar_object.c Log: Improved support for opcode caches. Now some open() syscalls might be eliminated by caches. http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.34&r2=1.266.2.35&diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.34 php-src/ext/phar/phar_object.c:1.266.2.35 --- php-src/ext/phar/phar_object.c:1.266.2.34 Wed Jul 9 08:47:05 2008 +++ php-src/ext/phar/phar_object.c Wed Jul 16 15:09:39 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar_object.c,v 1.266.2.34 2008/07/09 08:47:05 dmitry Exp $ */ +/* $Id: phar_object.c,v 1.266.2.35 2008/07/16 15:09:39 dmitry Exp $ */ #include "phar_internal.h" #include "func_interceptors.h" @@ -161,7 +161,7 @@ } /* }}} */ -static int phar_file_action(phar_entry_data *idata, char *mime_type, int code, char *entry, int entry_len, char *arch, int arch_len, char *basename, int basename_len, char *ru, int ru_len TSRMLS_DC) /* {{{ */ +static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char *mime_type, int code, char *entry, int entry_len, char *arch, int arch_len, char *basename, int basename_len, char *ru, int ru_len TSRMLS_DC) /* {{{ */ { char *name = NULL, buf[8192], *cwd; zend_syntax_highlighter_ini syntax_highlighter_ini; @@ -171,6 +171,8 @@ zend_file_handle file_handle; zend_op_array *new_op_array; zval *result = NULL; + php_stream *fp; + off_t position; switch (code) { case PHAR_MIME_PHPS: @@ -185,7 +187,6 @@ highlight_file(name, &syntax_highlighter_ini TSRMLS_CC); - phar_entry_delref(idata TSRMLS_CC); efree(name); #ifdef PHP_WIN32 efree(arch); @@ -197,60 +198,60 @@ ctr.line_len = spprintf(&(ctr.line), 0, "Content-type: %s", mime_type); sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); efree(ctr.line); - ctr.line_len = spprintf(&(ctr.line), 0, "Content-length: %d", idata->internal_file->uncompressed_filesize); + ctr.line_len = spprintf(&(ctr.line), 0, "Content-length: %d", info->uncompressed_filesize); sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC); efree(ctr.line); if (FAILURE == sapi_send_headers(TSRMLS_C)) { - phar_entry_delref(idata TSRMLS_CC); zend_bailout(); } /* prepare to output */ - if (!phar_get_efp(idata->internal_file, 1 TSRMLS_CC)) { + fp = phar_get_efp(info, 1 TSRMLS_CC); + if (!fp) { char *error; - if (!phar_open_jit(idata->phar, idata->internal_file, phar_get_pharfp(idata->phar TSRMLS_CC), &error, 0 TSRMLS_CC)) { + if (!phar_open_jit(phar, info, phar_get_pharfp(phar TSRMLS_CC), &error, 0 TSRMLS_CC)) { if (error) { zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error); efree(error); } return -1; } - idata->fp = phar_get_efp(idata->internal_file, 1 TSRMLS_CC); - idata->zero = phar_get_fp_offset(idata->internal_file TSRMLS_CC); + fp = phar_get_efp(info, 1 TSRMLS_CC); } - phar_seek_efp(idata->internal_file, 0, SEEK_SET, 0, 1 TSRMLS_CC); + position = 0; + phar_seek_efp(info, 0, SEEK_SET, 0, 1 TSRMLS_CC); do { - got = php_stream_read(idata->fp, buf, MIN(8192, idata->internal_file->uncompressed_filesize - idata->position)); - PHPWRITE(buf, got); - idata->position = php_stream_tell(idata->fp) - idata->zero; - if (idata->position == (off_t) idata->internal_file->uncompressed_filesize) { - break; + got = php_stream_read(fp, buf, MIN(8192, info->uncompressed_filesize - position)); + if (got > 0) { + PHPWRITE(buf, got); + position += got; +
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard var_unserializer.c
janiWed Jul 16 14:26:30 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard var_unserializer.c Log: - Regenerated using more recent re2c http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.8&r2=1.70.2.4.2.9&diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.8 php-src/ext/standard/var_unserializer.c:1.70.2.4.2.9 --- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.8Wed Mar 19 03:00:40 2008 +++ php-src/ext/standard/var_unserializer.c Wed Jul 16 14:26:30 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.12.1 on Mon Aug 6 21:32:14 2007 */ +/* Generated by re2c 0.13.5 on Wed Jul 16 17:25:51 2008 */ #line 1 "ext/standard/var_unserializer.re" /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: var_unserializer.c,v 1.70.2.4.2.8 2008/03/19 03:00:40 felipe Exp $ */ +/* $Id: var_unserializer.c,v 1.70.2.4.2.9 2008/07/16 14:26:30 jani Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -397,7 +397,10 @@ + +#line 402 "ext/standard/var_unserializer.c" { + YYCTYPE yych; static const unsigned char yybm[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -433,115 +436,111 @@ 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 437 "ext/standard/var_unserializer.c" - { - YYCTYPE yych; - - if((YYLIMIT - YYCURSOR) < 7) YYFILL(7); - yych = *YYCURSOR; - switch(yych) { - case 'C': - case 'O': goto yy13; - case 'N': goto yy5; - case 'R': goto yy2; - case 'S': goto yy10; - case 'a': goto yy11; - case 'b': goto yy6; - case 'd': goto yy8; - case 'i': goto yy7; - case 'o': goto yy12; - case 'r': goto yy4; - case 's': goto yy9; - case '}': goto yy14; - default:goto yy16; - } + if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7); + yych = *YYCURSOR; + switch (yych) { + case 'C': + case 'O': goto yy13; + case 'N': goto yy5; + case 'R': goto yy2; + case 'S': goto yy10; + case 'a': goto yy11; + case 'b': goto yy6; + case 'd': goto yy8; + case 'i': goto yy7; + case 'o': goto yy12; + case 'r': goto yy4; + case 's': goto yy9; + case '}': goto yy14; + default:goto yy16; + } yy2: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy95; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy95; yy3: #line 698 "ext/standard/var_unserializer.re" - { return 0; } -#line 465 "ext/standard/var_unserializer.c" + { return 0; } +#line 464 "ext/standard/var_unserializer.c" yy4: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy89; - goto yy3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy89; + goto yy3; yy5: - yych = *++YYCURSOR; - if(yych == ';') goto yy87; - goto yy3; + yych = *++YYCURSOR; + if (yych == ';') goto yy87; + goto yy3; yy6: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy83; - goto yy3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy83; + goto yy3; yy7: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy77; - goto yy3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy77; + goto yy3; yy8: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy53; - goto yy3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy53; + goto yy3; yy9: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy46; - goto yy3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy46; + goto yy3; yy10: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy39; - goto yy3; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == ':') goto yy39; + goto yy3; yy11: - yych = *(YYMARKER = ++YYCURSOR); - if(yych == ':') goto yy32; - goto yy3; + yych = *(YYMARKER = ++YYCURSOR); +
[PHP-CVS] cvs: php-src /ext/phar config.m4
janiWed Jul 16 14:12:33 2008 UTC Modified files: /php-src/ext/phar config.m4 Log: - Revert (dunno why I had this like this..) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.29&r2=1.30&diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.29 php-src/ext/phar/config.m4:1.30 --- php-src/ext/phar/config.m4:1.29 Wed Jul 16 14:08:02 2008 +++ php-src/ext/phar/config.m4 Wed Jul 16 14:12:33 2008 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.29 2008/07/16 14:08:02 jani Exp $ +dnl $Id: config.m4,v 1.30 2008/07/16 14:12:33 jani Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, -[ --disable-phar Disable phar support], yes) +[ --enable-phar Enable phar support]) if test "$PHP_PHAR" != "no"; then PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c /ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /ext/standard url_scanner_ex.c /main/streams xp_socket.c
janiWed Jul 16 14:10:50 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/socketssockets.c /php-src/ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /php-src/ext/standard url_scanner_ex.c /php-src/main/streams xp_socket.c Log: MFH:- Fixed bug #44127 (UNIX abstract namespace socket connect does not work) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1175&r2=1.2027.2.547.2.1176&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1175 php-src/NEWS:1.2027.2.547.2.1176 --- php-src/NEWS:1.2027.2.547.2.1175Tue Jul 15 14:58:58 2008 +++ php-src/NEWSWed Jul 16 14:10:49 2008 @@ -9,7 +9,8 @@ - Fixed a crash inside PDO when trying instantiate PDORow manually. (Felipe) - Fixed build failure of ext/mysqli with libmysql 6.0 - missing rpl functions. (Andrey) -- Fixed a regression when using strip_tags() and < is within an attribute. (Scott) +- Fixed a regression when using strip_tags() and < is within an attribute. + (Scott) - Fixed bug #45486 (mb_send_mail(); header 'Content-Type: text/plain; charset=' parsing incorrect). (Felipe) @@ -42,6 +43,8 @@ - Fixed bug #44716 (Progress notifications incorrect). (Hannes) - Fixed bug #44712 (stream_context_set_params segfaults on invalid arguments). (Hannes) +- Fixed bug #44127 (UNIX abstract namespace socket connect does not work). + (Jani) - Fixed bug #41348 (OCI8: allow compilation with Oracle 8.1). (Chris Jones) 01 May 2008, PHP 5.2.6 http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.18&r2=1.171.2.9.2.19&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.18 php-src/ext/sockets/sockets.c:1.171.2.9.2.19 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.18Tue Jul 15 11:20:06 2008 +++ php-src/ext/sockets/sockets.c Wed Jul 16 14:10:50 2008 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.171.2.9.2.18 2008/07/15 11:20:06 felipe Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.19 2008/07/16 14:10:50 jani Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1170,8 +1170,8 @@ memset(&s_un, 0, sizeof(struct sockaddr_un)); s_un.sun_family = AF_UNIX; - snprintf(s_un.sun_path, 108, "%s", addr); - retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, SUN_LEN(&s_un)); + memcpy(&s_un.sun_path, addr, addr_len); + retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + addr_len); break; default: http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv4loop.phpt?r1=1.1&r2=1.1.6.1&diff_format=u Index: php-src/ext/sockets/tests/ipv4loop.phpt diff -u php-src/ext/sockets/tests/ipv4loop.phpt:1.1 php-src/ext/sockets/tests/ipv4loop.phpt:1.1.6.1 --- php-src/ext/sockets/tests/ipv4loop.phpt:1.1 Thu Apr 17 23:09:17 2003 +++ php-src/ext/sockets/tests/ipv4loop.phpt Wed Jul 16 14:10:50 2008 @@ -3,7 +3,7 @@ --SKIPIF-- --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2.6.1&r2=1.2.6.2&diff_format=u Index: php-src/ext/sockets/tests/ipv6loop.phpt diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.2 --- php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 Mon Feb 12 14:49:04 2007 +++ php-src/ext/sockets/tests/ipv6loop.phpt Wed Jul 16 14:10:50 2008 @@ -3,7 +3,7 @@ --SKIPIF-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.95.2.4.2.6&r2=1.95.2.4.2.7&diff_format=u Index: php-src/ext/standard/url_scanner_ex.c diff -u php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.6 php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.7 --- php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.6 Wed Mar 12 11:27:42 2008 +++ php-src/ext/standard/url_scanner_ex.c Wed Jul 16 14:10:50 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.12.1 on Wed Oct 10 12:28:46 2007 */ +/* Generated by re2c 0.13.5 on Wed Jul 2 12:48:53 2008 */ #line 1 "ext/standard/url_scanner_ex.re" /* +--+ @@ -18,7 +18,7 @@ +--+ */ -/* $Id: url_scanner_ex.c,v 1.95.2.4.2.6 2008/03/12 11:27:42 felipe Exp $ */ +/* $Id: url_scanner_ex.c,v 1.95.2.4.2.7 2008/07/16 14:10:50 jani Exp $ */ #include "php.h" @@ -109,7 +109,10 @@ q = (p = url->c) + url->len; scan: + +#line 114 "ext/standard/url_scanner_ex.c" { + YYCTYPE yych; static const unsigned char yybm[] = { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, @@ -145,42 +148,37 @@
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sockets sockets.c /ext/sockets/tests ipv4loop.phpt ipv6loop.phpt unixloop.phpt /main/streams xp_socket.c
janiWed Jul 16 14:08:38 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/sockets/tests unixloop.phpt Modified files: /php-src/ext/socketssockets.c /php-src/ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /php-src/main/streams xp_socket.c Log: MFH:- Fixed bug #44127 (UNIX abstract namespace socket connect does not work) http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.4&r2=1.171.2.9.2.14.2.5&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.4 php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.5 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.4Fri Jul 4 14:08:16 2008 +++ php-src/ext/sockets/sockets.c Wed Jul 16 14:08:38 2008 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.171.2.9.2.14.2.4 2008/07/04 14:08:16 felipe Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.14.2.5 2008/07/16 14:08:38 jani Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1328,8 +1328,8 @@ memset(&s_un, 0, sizeof(struct sockaddr_un)); s_un.sun_family = AF_UNIX; - snprintf(s_un.sun_path, 108, "%s", addr); - retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, SUN_LEN(&s_un)); + memcpy(&s_un.sun_path, addr, addr_len); + retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + addr_len); break; default: http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv4loop.phpt?r1=1.1&r2=1.1.8.1&diff_format=u Index: php-src/ext/sockets/tests/ipv4loop.phpt diff -u php-src/ext/sockets/tests/ipv4loop.phpt:1.1 php-src/ext/sockets/tests/ipv4loop.phpt:1.1.8.1 --- php-src/ext/sockets/tests/ipv4loop.phpt:1.1 Thu Apr 17 23:09:17 2003 +++ php-src/ext/sockets/tests/ipv4loop.phpt Wed Jul 16 14:08:38 2008 @@ -3,7 +3,7 @@ --SKIPIF-- --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2.6.1&r2=1.2.6.1.2.1&diff_format=u Index: php-src/ext/sockets/tests/ipv6loop.phpt diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.1 --- php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 Mon Feb 12 14:49:04 2007 +++ php-src/ext/sockets/tests/ipv6loop.phpt Wed Jul 16 14:08:38 2008 @@ -3,7 +3,7 @@ --SKIPIF-- http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.6.2.4&r2=1.33.2.2.2.6.2.5&diff_format=u Index: php-src/main/streams/xp_socket.c diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.4 php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.5 --- php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.4 Fri Jul 11 10:25:15 2008 +++ php-src/main/streams/xp_socket.cWed Jul 16 14:08:38 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.4 2008/07/11 10:25:15 tony2001 Exp $ */ +/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.5 2008/07/16 14:08:38 jani Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -621,7 +621,7 @@ parse_unix_address(xparam, &unix_addr TSRMLS_CC); ret = php_network_connect_socket(sock->socket, - (const struct sockaddr *)&unix_addr, (socklen_t)sizeof(unix_addr), + (const struct sockaddr *)&unix_addr, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + xparam->inputs.namelen, xparam->op == STREAM_XPORT_OP_CONNECT_ASYNC, xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &err); http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/unixloop.phpt?view=markup&rev=1.1 Index: php-src/ext/sockets/tests/unixloop.phpt +++ php-src/ext/sockets/tests/unixloop.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar config.m4 /ext/sockets sockets.c /ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /main/streams xp_socket.c
janiWed Jul 16 14:08:04 2008 UTC Modified files: /php-src/ext/phar config.m4 /php-src/ext/socketssockets.c /php-src/ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /php-src/main/streams xp_socket.c Log: - Fixed bug #44127 (UNIX abstract namespace socket connect does not work) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.28&r2=1.29&diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.28 php-src/ext/phar/config.m4:1.29 --- php-src/ext/phar/config.m4:1.28 Sat May 17 20:07:38 2008 +++ php-src/ext/phar/config.m4 Wed Jul 16 14:08:02 2008 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.28 2008/05/17 20:07:38 cellog Exp $ +dnl $Id: config.m4,v 1.29 2008/07/16 14:08:02 jani Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, -[ --enable-phar Enable phar support]) +[ --disable-phar Disable phar support], yes) if test "$PHP_PHAR" != "no"; then PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.198&r2=1.199&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.198 php-src/ext/sockets/sockets.c:1.199 --- php-src/ext/sockets/sockets.c:1.198 Fri Jul 4 14:10:24 2008 +++ php-src/ext/sockets/sockets.c Wed Jul 16 14:08:04 2008 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.198 2008/07/04 14:10:24 felipe Exp $ */ +/* $Id: sockets.c,v 1.199 2008/07/16 14:08:04 jani Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1318,8 +1318,8 @@ memset(&s_un, 0, sizeof(struct sockaddr_un)); s_un.sun_family = AF_UNIX; - snprintf(s_un.sun_path, 108, "%s", addr); - retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, SUN_LEN(&s_un)); + memcpy(&s_un.sun_path, addr, addr_len); + retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + addr_len); break; default: http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv4loop.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/sockets/tests/ipv4loop.phpt diff -u php-src/ext/sockets/tests/ipv4loop.phpt:1.1 php-src/ext/sockets/tests/ipv4loop.phpt:1.2 --- php-src/ext/sockets/tests/ipv4loop.phpt:1.1 Thu Apr 17 23:09:17 2003 +++ php-src/ext/sockets/tests/ipv4loop.phpt Wed Jul 16 14:08:04 2008 @@ -3,7 +3,7 @@ --SKIPIF-- --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/sockets/tests/ipv6loop.phpt diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.3 php-src/ext/sockets/tests/ipv6loop.phpt:1.4 --- php-src/ext/sockets/tests/ipv6loop.phpt:1.3 Mon Feb 12 14:48:52 2007 +++ php-src/ext/sockets/tests/ipv6loop.phpt Wed Jul 16 14:08:04 2008 @@ -3,7 +3,7 @@ --SKIPIF-- http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.46&r2=1.47&diff_format=u Index: php-src/main/streams/xp_socket.c diff -u php-src/main/streams/xp_socket.c:1.46 php-src/main/streams/xp_socket.c:1.47 --- php-src/main/streams/xp_socket.c:1.46 Fri Jul 11 10:24:29 2008 +++ php-src/main/streams/xp_socket.cWed Jul 16 14:08:04 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: xp_socket.c,v 1.46 2008/07/11 10:24:29 tony2001 Exp $ */ +/* $Id: xp_socket.c,v 1.47 2008/07/16 14:08:04 jani Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -621,7 +621,7 @@ parse_unix_address(xparam, &unix_addr TSRMLS_CC); ret = php_network_connect_socket(sock->socket, - (const struct sockaddr *)&unix_addr, (socklen_t)sizeof(unix_addr), + (const struct sockaddr *)&unix_addr, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + xparam->inputs.namelen, xparam->op == STREAM_XPORT_OP_CONNECT_ASYNC, xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &err); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap.c
felipe Wed Jul 16 13:42:51 2008 UTC Modified files: /php-src/ext/ldap ldap.c Log: - MFB: Fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.187&r2=1.188&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.187 php-src/ext/ldap/ldap.c:1.188 --- php-src/ext/ldap/ldap.c:1.187 Tue Jul 1 08:12:42 2008 +++ php-src/ext/ldap/ldap.c Wed Jul 16 13:42:51 2008 @@ -23,7 +23,7 @@ +--+ */ -/* $Id: ldap.c,v 1.187 2008/07/01 08:12:42 tony2001 Exp $ */ +/* $Id: ldap.c,v 1.188 2008/07/16 13:42:51 felipe Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -224,7 +224,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.187 2008/07/01 08:12:42 tony2001 Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.188 2008/07/16 13:42:51 felipe Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -2434,7 +2434,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_set_option, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, option) - ZEND_ARG_INFO(1, newval) + ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO() static -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ldap ldap.c
felipe Wed Jul 16 13:41:35 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ldap ldap.c Log: - Fix typo (thanks Pierre) http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.16&r2=1.161.2.3.2.11.2.17&diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.16 php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.17 --- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.16 Tue Jul 1 07:43:36 2008 +++ php-src/ext/ldap/ldap.c Wed Jul 16 13:41:35 2008 @@ -23,7 +23,7 @@ +--+ */ -/* $Id: ldap.c,v 1.161.2.3.2.11.2.16 2008/07/01 07:43:36 tony2001 Exp $ */ +/* $Id: ldap.c,v 1.161.2.3.2.11.2.17 2008/07/16 13:41:35 felipe Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -224,7 +224,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.16 2008/07/01 07:43:36 tony2001 Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.11.2.17 2008/07/16 13:41:35 felipe Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); @@ -2426,7 +2426,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_set_option, 0, 0, 3) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, option) - ZEND_ARG_INFO(1, newval) + ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO() static -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl config.m4
janiWed Jul 16 12:37:00 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/intl config.m4 Log: - Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/intl/config.m4?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/intl/config.m4 diff -u php-src/ext/intl/config.m4:1.1.2.2 php-src/ext/intl/config.m4:1.1.2.3 --- php-src/ext/intl/config.m4:1.1.2.2 Mon Jul 14 09:02:26 2008 +++ php-src/ext/intl/config.m4 Wed Jul 16 12:37:00 2008 @@ -51,7 +51,7 @@ msgformat/msgformat_helpers.cpp \ msgformat/msgformat_parse.c \ grapheme/grapheme_string.c \ -grapheme/grapheme_util.c,$ext_shared) +grapheme/grapheme_util.c,$ext_shared,,$ICU_INCS) PHP_ADD_BUILD_DIR($ext_builddir/collator) PHP_ADD_BUILD_DIR($ext_builddir/common) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Wed Jul 16 12:35:45 2008 UTC Modified files: /php-src/ext/date php_date.c Log: - MF53: Fixed segfault. http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.195&r2=1.196&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.195 php-src/ext/date/php_date.c:1.196 --- php-src/ext/date/php_date.c:1.195 Mon Jul 14 17:38:19 2008 +++ php-src/ext/date/php_date.c Wed Jul 16 12:35:45 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.195 2008/07/14 17:38:19 derick Exp $ */ +/* $Id: php_date.c,v 1.196 2008/07/16 12:35:45 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -3095,6 +3095,7 @@ tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone_object TSRMLS_CC); if (tzobj->type != TIMELIB_ZONETYPE_ID) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only do this for zones with ID for now"); + return; } timelib_set_timezone(dateobj->time, tzobj->tzi.tz); timelib_unixtime2local(dateobj->time, dateobj->time->sse); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c
derick Wed Jul 16 12:35:11 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c Log: - Fixed a segfault - simply a forgotten return; http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.44&r2=1.43.2.45.2.51.2.45&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.44 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.45 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.44 Mon Jul 14 17:38:33 2008 +++ php-src/ext/date/php_date.c Wed Jul 16 12:35:11 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.44 2008/07/14 17:38:33 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.45 2008/07/16 12:35:11 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -2928,6 +2928,7 @@ tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone_object TSRMLS_CC); if (tzobj->type != TIMELIB_ZONETYPE_ID) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only do this for zones with ID for now"); + return; } timelib_set_timezone(dateobj->time, tzobj->tzi.tz); timelib_unixtime2local(dateobj->time, dateobj->time->sse); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring php_mbregex.h
hirokawaWed Jul 16 12:21:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring php_mbregex.h Log: fixed compile error on Win32 environment. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.h?r1=1.12.2.1.2.1.2.4&r2=1.12.2.1.2.1.2.5&diff_format=u Index: php-src/ext/mbstring/php_mbregex.h diff -u php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.4 php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.5 --- php-src/ext/mbstring/php_mbregex.h:1.12.2.1.2.1.2.4 Wed Jul 16 02:30:48 2008 +++ php-src/ext/mbstring/php_mbregex.h Wed Jul 16 12:21:46 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.4 2008/07/16 02:30:48 moriyoshi Exp $ */ +/* $Id: php_mbregex.h,v 1.12.2.1.2.1.2.5 2008/07/16 12:21:46 hirokawa Exp $ */ #ifndef _PHP_MBREGEX_H #define _PHP_MBREGEX_H @@ -26,7 +26,7 @@ #include "php.h" #include "zend.h" #include "php_onig_compat.h" /* must come prior to the oniguruma header */ -#include "oniguruma.h" +#include "oniguruma/oniguruma.h" #undef UChar /* {{{ PHP_MBREGEX_GLOBALS */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/aolserver aolserver.c /sapi/apache2handler php_functions.c /sapi/milter php_milter.c /sapi/nsapi nsapi.c
felipe Wed Jul 16 11:59:34 2008 UTC Modified files: /php-src/sapi/aolserver aolserver.c /php-src/sapi/apache2handlerphp_functions.c /php-src/sapi/milterphp_milter.c /php-src/sapi/nsapi nsapi.c Log: - MFB: Added arginfo http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.87&r2=1.88&diff_format=u Index: php-src/sapi/aolserver/aolserver.c diff -u php-src/sapi/aolserver/aolserver.c:1.87 php-src/sapi/aolserver/aolserver.c:1.88 --- php-src/sapi/aolserver/aolserver.c:1.87 Wed Mar 19 16:37:48 2008 +++ php-src/sapi/aolserver/aolserver.c Wed Jul 16 11:59:34 2008 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.87 2008/03/19 16:37:48 rasmus Exp $ */ +/* $Id: aolserver.c,v 1.88 2008/07/16 11:59:34 felipe Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.87 2008/03/19 16:37:48 rasmus Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.88 2008/07/16 11:59:34 felipe Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -240,8 +240,14 @@ PHP_FUNCTION(getallheaders); +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO(arginfo_aolserver_getallheaders, 0) +ZEND_END_ARG_INFO() +/* }}} */ + static const zend_function_entry aolserver_functions[] = { - PHP_FE(getallheaders, NULL) + PHP_FE(getallheaders, arginfo_aolserver_getallheaders) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.32&r2=1.33&diff_format=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.32 php-src/sapi/apache2handler/php_functions.c:1.33 --- php-src/sapi/apache2handler/php_functions.c:1.32Tue Mar 4 23:39:14 2008 +++ php-src/sapi/apache2handler/php_functions.c Wed Jul 16 11:59:34 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.32 2008/03/04 23:39:14 felipe Exp $ */ +/* $Id: php_functions.c,v 1.33 2008/07/16 11:59:34 felipe Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -478,17 +478,64 @@ } } +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_lookup_uri, 0, 0, 1) + ZEND_ARG_INFO(0, filename) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_virtual, 0, 0, 1) + ZEND_ARG_INFO(0, uri) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_response_headers, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_getallheaders, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_note, 0, 0, 1) + ZEND_ARG_INFO(0, note_name) + ZEND_ARG_INFO(0, note_value) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_setenv, 0, 0, 2) + ZEND_ARG_INFO(0, variable) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, walk_to_top) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_getenv, 0, 0, 1) + ZEND_ARG_INFO(0, variable) + ZEND_ARG_INFO(0, walk_to_top) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_version, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_modules, 0) +ZEND_END_ARG_INFO() +/* }}} */ + static const zend_function_entry apache_functions[] = { - PHP_FE(apache_lookup_uri, NULL) - PHP_FE(virtual, NULL) - PHP_FE(apache_request_headers, NULL) - PHP_FE(apache_response_headers, NULL) - PHP_FE(apache_setenv, NULL) - PHP_FE(apache_getenv, NULL) - PHP_FE(apache_note, NULL) - PHP_FE(apache_get_version, NULL) - PHP_FE(apache_get_modules, NULL) - PHP_FALIAS(getallheaders, apache_request_headers, NULL) + PHP_FE(apache_lookup_uri, arginfo_apache2handler_lookup_uri) + PHP_FE(virtual, arginfo_apache2handler_virtual) + PHP_FE(apache_request_headers, arginfo_apache2handler_getallheaders) + PHP_FE(apache_response_headers, arginfo_apache2handler_response_headers) + PHP_FE(apache_setenv, arginfo_apache2handler_setenv) + PHP_FE(apache_getenv, arginfo_apache2handler_getenv) + PHP_FE(apache_note, arginfo_apache2handler_note) + PHP_FE(apache_get_version, arginfo_apache2handler_get_version) + PHP_FE(apache_get_modules, arginfo_apache2handler_get_modules) + PHP_FALIAS(getallheaders, apache_request_headers, arginfo_
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/aolserver aolserver.c /sapi/apache2handler php_functions.c /sapi/milter php_milter.c /sapi/nsapi nsapi.c
felipe Wed Jul 16 11:59:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/aolserver aolserver.c /php-src/sapi/apache2handlerphp_functions.c /php-src/sapi/milterphp_milter.c /php-src/sapi/nsapi nsapi.c Log: - Added arginfo http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.81.2.2.2.1.2.3&r2=1.81.2.2.2.1.2.4&diff_format=u Index: php-src/sapi/aolserver/aolserver.c diff -u php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.3 php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.4 --- php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.3 Tue Mar 18 22:23:20 2008 +++ php-src/sapi/aolserver/aolserver.c Wed Jul 16 11:59:15 2008 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.81.2.2.2.1.2.3 2008/03/18 22:23:20 rasmus Exp $ */ +/* $Id: aolserver.c,v 1.81.2.2.2.1.2.4 2008/07/16 11:59:15 felipe Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.81.2.2.2.1.2.3 2008/03/18 22:23:20 rasmus Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.81.2.2.2.1.2.4 2008/07/16 11:59:15 felipe Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -240,8 +240,14 @@ PHP_FUNCTION(getallheaders); +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO(arginfo_aolserver_getallheaders, 0) +ZEND_END_ARG_INFO() +/* }}} */ + const static zend_function_entry aolserver_functions[] = { - PHP_FE(getallheaders, NULL) + PHP_FE(getallheaders, arginfo_aolserver_getallheaders) {NULL, NULL, NULL} }; http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.3&r2=1.18.2.6.2.5.2.4&diff_format=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.3 php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.4 --- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.3Mon Mar 10 22:12:33 2008 +++ php-src/sapi/apache2handler/php_functions.c Wed Jul 16 11:59:15 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.18.2.6.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */ +/* $Id: php_functions.c,v 1.18.2.6.2.5.2.4 2008/07/16 11:59:15 felipe Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -478,17 +478,64 @@ } } +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_lookup_uri, 0, 0, 1) + ZEND_ARG_INFO(0, filename) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_virtual, 0, 0, 1) + ZEND_ARG_INFO(0, uri) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_response_headers, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_getallheaders, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_note, 0, 0, 1) + ZEND_ARG_INFO(0, note_name) + ZEND_ARG_INFO(0, note_value) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_setenv, 0, 0, 2) + ZEND_ARG_INFO(0, variable) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, walk_to_top) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_getenv, 0, 0, 1) + ZEND_ARG_INFO(0, variable) + ZEND_ARG_INFO(0, walk_to_top) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_version, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_modules, 0) +ZEND_END_ARG_INFO() +/* }}} */ + static const zend_function_entry apache_functions[] = { - PHP_FE(apache_lookup_uri, NULL) - PHP_FE(virtual, NULL) - PHP_FE(apache_request_headers, NULL) - PHP_FE(apache_response_headers, NULL) - PHP_FE(apache_setenv, NULL) - PHP_FE(apache_getenv, NULL) - PHP_FE(apache_note, NULL) - PHP_FE(apache_get_version, NULL) - PHP_FE(apache_get_modules, NULL) - PHP_FALIAS(getallheaders, apache_request_headers, NULL) + PHP_FE(apache_lookup_uri, arginfo_apache2handler_lookup_uri) + PHP_FE(virtual, arginfo_apache2handler_virtual) + PHP_FE(apache_request_headers, arginfo_apache2handler_getallheaders) + PHP_FE(apache_response_headers, arginfo_apache2handler_response_headers) + PHP_FE(apache_setenv, arginfo_apache2handler_setenv) + PHP_FE(apache_getenv, arginfo_apache2handler_getenv) + PHP_FE(apache_note, arginfo_apache2handler_note) + PHP_FE(apach
[PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c
tony2001Wed Jul 16 08:00:43 2008 UTC Modified files: /php-src/ext/mcrypt mcrypt.c Log: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.113&r2=1.114&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.113 php-src/ext/mcrypt/mcrypt.c:1.114 --- php-src/ext/mcrypt/mcrypt.c:1.113 Tue Jul 15 17:04:17 2008 +++ php-src/ext/mcrypt/mcrypt.c Wed Jul 16 08:00:43 2008 @@ -16,7 +16,7 @@ | Derick Rethans <[EMAIL PROTECTED]>| +--+ */ -/* $Id: mcrypt.c,v 1.113 2008/07/15 17:04:17 pajoye Exp $ */ +/* $Id: mcrypt.c,v 1.114 2008/07/16 08:00:43 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1232,7 +1232,7 @@ *iv_len = size; #else size_t read_bytes = 0; - int fd; + int fd, n; fd = open(source == PHP_MCRYPT_IV_SOURCE_RANDOM ? "/dev/random" : "/dev/urandom", O_RDONLY); if (fd < 0) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests bug41523-64bit.phpt bug41709.phpt date_parse_001.phpt
derick Wed Jul 16 07:36:04 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date/tests bug41523-64bit.phpt bug41709.phpt date_parse_001.phpt Log: - MFH: Fixed tests. http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523-64bit.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/date/tests/bug41523-64bit.phpt diff -u php-src/ext/date/tests/bug41523-64bit.phpt:1.1.2.3 php-src/ext/date/tests/bug41523-64bit.phpt:1.1.2.4 --- php-src/ext/date/tests/bug41523-64bit.phpt:1.1.2.3 Mon Apr 7 17:41:58 2008 +++ php-src/ext/date/tests/bug41523-64bit.phpt Wed Jul 16 07:36:04 2008 @@ -29,9 +29,11 @@ ["fraction"]=> float(0) ["warning_count"]=> - int(0) + int(1) ["warnings"]=> - array(0) { + array(1) { +[20]=> +string(27) "The parsed date was invalid" } ["error_count"]=> int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41709.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/date/tests/bug41709.phpt diff -u php-src/ext/date/tests/bug41709.phpt:1.1.2.2 php-src/ext/date/tests/bug41709.phpt:1.1.2.2.2.1 --- php-src/ext/date/tests/bug41709.phpt:1.1.2.2Thu Jul 12 18:58:00 2007 +++ php-src/ext/date/tests/bug41709.phptWed Jul 16 07:36:04 2008 @@ -18,9 +18,10 @@ [minute] => 0 [second] => 0 [fraction] => 0 -[warning_count] => 0 +[warning_count] => 1 [warnings] => Array ( +[22] => The parsed date was invalid ) [error_count] => 1 http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_parse_001.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/date/tests/date_parse_001.phpt diff -u php-src/ext/date/tests/date_parse_001.phpt:1.1.2.2 php-src/ext/date/tests/date_parse_001.phpt:1.1.2.2.2.1 --- php-src/ext/date/tests/date_parse_001.phpt:1.1.2.2 Fri Dec 22 13:07:53 2006 +++ php-src/ext/date/tests/date_parse_001.phpt Wed Jul 16 07:36:04 2008 @@ -89,9 +89,11 @@ ["fraction"]=> bool(false) ["warning_count"]=> - int(0) + int(1) ["warnings"]=> - array(0) { + array(1) { +[12]=> +string(27) "The parsed date was invalid" } ["error_count"]=> int(1) @@ -125,9 +127,11 @@ ["fraction"]=> bool(false) ["warning_count"]=> - int(0) + int(1) ["warnings"]=> - array(0) { + array(1) { +[11]=> +string(27) "The parsed date was invalid" } ["error_count"]=> int(0) @@ -181,9 +185,11 @@ ["fraction"]=> bool(false) ["warning_count"]=> - int(0) + int(1) ["warnings"]=> - array(0) { + array(1) { +[8]=> +string(27) "The parsed date was invalid" } ["error_count"]=> int(0) @@ -298,6 +304,6 @@ bool(false) } -Warning: date_parse() expects parameter 1 to be string, array given in %s on line %d +Warning: date_parse() expects parameter 1 to be string, array given in /home/derick/dev/php/php-5.3dev/ext/date/tests/date_parse_001.php on line 11 bool(false) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests bug41523-64bit.phpt bug41709.phpt date_parse_001.phpt
derick Wed Jul 16 07:35:56 2008 UTC Modified files: /php-src/ext/date/tests bug41523-64bit.phpt bug41709.phpt date_parse_001.phpt Log: - Fixed tests. http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41523-64bit.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/date/tests/bug41523-64bit.phpt diff -u php-src/ext/date/tests/bug41523-64bit.phpt:1.4 php-src/ext/date/tests/bug41523-64bit.phpt:1.5 --- php-src/ext/date/tests/bug41523-64bit.phpt:1.4 Sat Jun 7 20:33:35 2008 +++ php-src/ext/date/tests/bug41523-64bit.phpt Wed Jul 16 07:35:56 2008 @@ -29,9 +29,11 @@ [u"fraction"]=> float(0) [u"warning_count"]=> - int(0) + int(1) [u"warnings"]=> - array(0) { + array(1) { +[20]=> +unicode(27) "The parsed date was invalid" } [u"error_count"]=> int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41709.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/bug41709.phpt diff -u php-src/ext/date/tests/bug41709.phpt:1.1 php-src/ext/date/tests/bug41709.phpt:1.2 --- php-src/ext/date/tests/bug41709.phpt:1.1Thu Jul 12 18:56:42 2007 +++ php-src/ext/date/tests/bug41709.phptWed Jul 16 07:35:56 2008 @@ -18,9 +18,10 @@ [minute] => 0 [second] => 0 [fraction] => 0 -[warning_count] => 0 +[warning_count] => 1 [warnings] => Array ( +[22] => The parsed date was invalid ) [error_count] => 1 http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_parse_001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/date/tests/date_parse_001.phpt diff -u php-src/ext/date/tests/date_parse_001.phpt:1.4 php-src/ext/date/tests/date_parse_001.phpt:1.5 --- php-src/ext/date/tests/date_parse_001.phpt:1.4 Sat Jun 7 20:33:35 2008 +++ php-src/ext/date/tests/date_parse_001.phpt Wed Jul 16 07:35:56 2008 @@ -89,9 +89,11 @@ [u"fraction"]=> bool(false) [u"warning_count"]=> - int(0) + int(1) [u"warnings"]=> - array(0) { + array(1) { +[12]=> +unicode(27) "The parsed date was invalid" } [u"error_count"]=> int(1) @@ -125,9 +127,11 @@ [u"fraction"]=> bool(false) [u"warning_count"]=> - int(0) + int(1) [u"warnings"]=> - array(0) { + array(1) { +[11]=> +unicode(27) "The parsed date was invalid" } [u"error_count"]=> int(0) @@ -181,9 +185,11 @@ [u"fraction"]=> bool(false) [u"warning_count"]=> - int(0) + int(1) [u"warnings"]=> - array(0) { + array(1) { +[8]=> +unicode(27) "The parsed date was invalid" } [u"error_count"]=> int(0) @@ -298,6 +304,6 @@ bool(false) } -Warning: date_parse() expects parameter 1 to be binary string, array given in %s on line %d +Warning: date_parse() expects parameter 1 to be binary string, array given in /home/derick/dev/php/php-6.0dev/ext/date/tests/date_parse_001.php on line 11 bool(false) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php