[PHP-CVS] cvs: spl / spl_directory.c spl_directory.h
helly Tue Dec 2 02:13:54 2003 EDT
Modified files:
/splspl_directory.c spl_directory.h
Log:
Move object struct to header.
Index: spl/spl_directory.c
diff -u spl/spl_directory.c:1.15 spl/spl_directory.c:1.16
--- spl/spl_directory.c:1.15Sat Nov 29 13:31:24 2003
+++ spl/spl_directory.c Tue Dec 2 02:13:53 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.15 2003/11/29 18:31:24 helly Exp $ */
+/* $Id: spl_directory.c,v 1.16 2003/12/02 07:13:53 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -33,6 +33,7 @@
#include spl_functions.h
#include spl_engine.h
#include spl_iterators.h
+#include spl_directory.h
#include php.h
#include fopen_wrappers.h
@@ -107,19 +108,6 @@
zend_class_entry *spl_ce_RecursiveDirectoryIterator;
-/* the overloaded class structure */
-
-/* overloading the structure results in the need of having
- dedicated creatin/cloning/destruction functions */
-typedef struct _spl_ce_dir_object {
- zend_object std;
- php_stream*dirp;
- php_stream_dirent entry;
- char *path;
- int index;
-} spl_ce_dir_object;
-
-
/* {{{ spl_ce_dir_object_dtor */
/* close all resources and the memory allocated for the object */
static void spl_ce_dir_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
Index: spl/spl_directory.h
diff -u spl/spl_directory.h:1.1 spl/spl_directory.h:1.2
--- spl/spl_directory.h:1.1 Sun Nov 9 09:05:35 2003
+++ spl/spl_directory.h Tue Dec 2 02:13:53 2003
@@ -26,6 +26,14 @@
PHP_MINIT_FUNCTION(spl_directory);
+typedef struct _spl_ce_dir_object {
+ zend_object std;
+ php_stream*dirp;
+ php_stream_dirent entry;
+ char *path;
+ int index;
+} spl_ce_dir_object;
+
#endif /* SPL_DIRECTORY_H */
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: spl / php_spl.c spl_iterators.c spl_iterators.h
helly Tue Dec 2 02:18:05 2003 EDT
Modified files:
/splphp_spl.c spl_iterators.c spl_iterators.h
Log:
Add classes from examples: FilterIterator, ParentIterator
Index: spl/php_spl.c
diff -u spl/php_spl.c:1.20 spl/php_spl.c:1.21
--- spl/php_spl.c:1.20 Wed Nov 26 18:28:34 2003
+++ spl/php_spl.c Tue Dec 2 02:18:04 2003
@@ -172,6 +172,8 @@
SPL_ADD_CLASS(DirectoryIterator);
SPL_ADD_CLASS(RecursiveIterator);
SPL_ADD_CLASS(RecursiveIteratorIterator);
+ SPL_ADD_CLASS(FilterIterator);
+ SPL_ADD_CLASS(ParentIterator);
}
/* }}} */
Index: spl/spl_iterators.c
diff -u spl/spl_iterators.c:1.6 spl/spl_iterators.c:1.7
--- spl/spl_iterators.c:1.6 Sat Nov 29 13:31:24 2003
+++ spl/spl_iterators.c Tue Dec 2 02:18:04 2003
@@ -30,9 +30,12 @@
#include spl_functions.h
#include spl_engine.h
#include spl_iterators.h
+#include spl_directory.h
zend_class_entry *spl_ce_RecursiveIterator;
zend_class_entry *spl_ce_RecursiveIteratorIterator;
+zend_class_entry *spl_ce_FilterIterator;
+zend_class_entry *spl_ce_ParentIterator;
function_entry spl_funcs_RecursiveIterator[] = {
SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
@@ -105,7 +108,7 @@
zval *zobject;
} spl_recursive_it_iterator;
-static zend_object_handlers spl_handlers_RecursiveIteratorIterator;
+static zend_object_handlers spl_handlers_iterators;
static void spl_recursive_it_dtor(zend_object_iterator *_iter TSRMLS_DC)
{
@@ -218,6 +221,19 @@
ce = object-iterators[object-level].ce;
zobject = object-iterators[object-level].zobject;
zend_call_method_with_0_params(zobject, ce, NULL,
getchildren, child);
+#if 0||MBO_0
+ fprintf(stderr, Access\n);
+ {
+ spl_dual_it_object *parent;
+ spl_ce_dir_object *dir;
+ fprintf(stderr, Value:%p, %d = %s\n, child,
child-value.obj.handle, Z_OBJCE_P(child)-name);
+ parent =
(spl_dual_it_object*)zend_object_store_get_object(child TSRMLS_CC);
+ fprintf(stderr, Parent:%p,
parent-inner.zobject);
+ fprintf(stderr, , %d\n,
parent-inner.zobject-value.obj.handle);
+ dir =
(spl_ce_dir_object*)zend_object_store_get_object(parent-inner.zobject TSRMLS_CC);
+ fprintf(stderr, PATH:%s\n, dir-path);
+ }
+#endif
ce = Z_OBJCE_P(child);
if (!ce || !instanceof_function(ce,
spl_ce_RecursiveIterator TSRMLS_CC)) {
zend_throw_exception(zend_exception_get_default(), Objects returned by
RecursiveIterator::getChildren() must implement RecursiveIterator, 0 TSRMLS_CC);
@@ -230,13 +246,13 @@
}
object-iterators = erealloc(object-iterators,
sizeof(spl_sub_iterator) * (++object-level+1));
sub_iter = ce-get_iterator(ce, child TSRMLS_CC);
- if (sub_iter-funcs-rewind) {
- sub_iter-funcs-rewind(sub_iter TSRMLS_CC);
- }
object-iterators[object-level].iterator = sub_iter;
object-iterators[object-level].zobject = child;
object-iterators[object-level].ce = ce;
object-iterators[object-level].state = RS_START;
+ if (sub_iter-funcs-rewind) {
+ sub_iter-funcs-rewind(sub_iter TSRMLS_CC);
+ }
goto next_step;
}
/* no more elements */
@@ -444,11 +460,273 @@
zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
retval.handle = zend_objects_store_put(intern,
spl_dtor_RecursiveIteratorIterator, NULL TSRMLS_CC);
- retval.handlers = spl_handlers_RecursiveIteratorIterator;
+ retval.handlers = spl_handlers_iterators;
return retval;
}
/* }}} */
+#if MBO_0
+static int spl_dual_it_gets_implemented(zend_class_entry *interface, zend_class_entry
*class_type TSRMLS_DC)
+{
+ class_type-iterator_funcs.zf_has_more = NULL;
+ class_type-iterator_funcs.zf_current = NULL;
+ class_type-iterator_funcs.zf_key = NULL;
+ class_type-iterator_funcs.zf_next = NULL;
+ class_type-iterator_funcs.zf_rewind = NULL;
+ if (!class_type-iterator_funcs.funcs) {
[PHP-CVS] cvs: spl / spl_iterators.c
helly Tue Dec 2 02:19:32 2003 EDT
Modified files:
/splspl_iterators.c
Log:
Remove debug code
Index: spl/spl_iterators.c
diff -u spl/spl_iterators.c:1.7 spl/spl_iterators.c:1.8
--- spl/spl_iterators.c:1.7 Tue Dec 2 02:18:04 2003
+++ spl/spl_iterators.c Tue Dec 2 02:19:31 2003
@@ -221,19 +221,6 @@
ce = object-iterators[object-level].ce;
zobject = object-iterators[object-level].zobject;
zend_call_method_with_0_params(zobject, ce, NULL,
getchildren, child);
-#if 0||MBO_0
- fprintf(stderr, Access\n);
- {
- spl_dual_it_object *parent;
- spl_ce_dir_object *dir;
- fprintf(stderr, Value:%p, %d = %s\n, child,
child-value.obj.handle, Z_OBJCE_P(child)-name);
- parent =
(spl_dual_it_object*)zend_object_store_get_object(child TSRMLS_CC);
- fprintf(stderr, Parent:%p,
parent-inner.zobject);
- fprintf(stderr, , %d\n,
parent-inner.zobject-value.obj.handle);
- dir =
(spl_ce_dir_object*)zend_object_store_get_object(parent-inner.zobject TSRMLS_CC);
- fprintf(stderr, PATH:%s\n, dir-path);
- }
-#endif
ce = Z_OBJCE_P(child);
if (!ce || !instanceof_function(ce,
spl_ce_RecursiveIterator TSRMLS_CC)) {
zend_throw_exception(zend_exception_get_default(), Objects returned by
RecursiveIterator::getChildren() must implement RecursiveIterator, 0 TSRMLS_CC);
@@ -643,17 +630,6 @@
zend_call_method_with_0_params(intern-inner.zobject, intern-inner.ce, NULL,
getchildren, retval);
spl_instantiate_arg_ex1(spl_ce_ParentIterator, return_value, 0, retval
TSRMLS_CC);
-#if 0||MBO_0
- {
- spl_dual_it_object *parent;
- spl_ce_dir_object *dir;
- fprintf(stderr, Value:%p, %d\n, return_value,
return_value-value.obj.handle);
- parent =
(spl_dual_it_object*)zend_object_store_get_object(return_value TSRMLS_CC);
- fprintf(stderr, Parent:%p, %d\n, parent-inner.zobject,
parent-inner.zobject-value.obj.handle);
- dir =
(spl_ce_dir_object*)zend_object_store_get_object(parent-inner.zobject TSRMLS_CC);
- fprintf(stderr, PATH:%s\n, dir-path);
- }
-#endif
zval_ptr_dtor(retval);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv/tests iconv_mime_decode_headers.phpt
moriyoshi Tue Dec 2 02:38:12 2003 EDT Modified files: /php-src/ext/iconv/testsiconv_mime_decode_headers.phpt Log: Fix test so it fits the expected behaviour Index: php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt diff -u php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.1 php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.2 --- php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.1 Mon Dec 1 19:05:54 2003 +++ php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt Tue Dec 2 02:38:11 2003 @@ -82,7 +82,7 @@ [Content-Type]= string(28) TEXT/PLAIN; charset=US-ASCII [Subject]= - string(54) [PHP-DEV] [ICONV] test for iconv_mime_decode_headers() + string(54) [PHP-DEV] [ICONV] test for iconv mime decode headers() [X-UIDL]= string(20) @eH!!h2:!!EOS!!A_c! } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / buildconf
sniper Tue Dec 2 03:00:24 2003 EDT Modified files: /php-srcbuildconf Log: Revert undiscussed / undecided patch Index: php-src/buildconf diff -u php-src/buildconf:1.61 php-src/buildconf:1.62 --- php-src/buildconf:1.61 Mon Dec 1 16:37:35 2003 +++ php-src/buildconf Tue Dec 2 03:00:23 2003 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: buildconf,v 1.61 2003/12/01 21:37:35 iliaa Exp $ +# $Id: buildconf,v 1.62 2003/12/02 08:00:23 sniper Exp $ eval `grep '^EXTRA_VERSION=' configure.in` case $EXTRA_VERSION in @@ -12,32 +12,19 @@ esac devok=0 -pecl_args=0 -# Import 'gold' extensions from PECL -GOLDEN='tidy' +while test $# -gt 0; do + if test $1 = --copy; then +automake_flags=--copy + fi + + if test $1 = --force; then +devok=1 +echo Forcing buildconf + fi -for i in $*; do - if test $i = --pecl-import; then - pecl_args=1 - elif test $i = --copy; then - automake_flags=--copy - pecl_args=0 - elif test $i = --force; then - devok=1 - echo Forcing buildconf - pecl_args=0 - elif test $pecl_args -eq 1; then - # Allow the developer to specify some custom PECL extensions to fetch - GOLDEN=$GOLDEN $i - fi -done; - -cd ext; -for ext in $GOLDEN; do - cvs co -d $ext pecl/$ext; + shift done -cd ..; if test $dev = 0 -a $devok = 0; then echo You should not run buildconf in a release package. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.h
wez Tue Dec 2 03:54:40 2003 EDT Modified files: /php-src/ext/mbstring mbstring.h Log: Fix MBSTRING_API for non-shared win32 builds Index: php-src/ext/mbstring/mbstring.h diff -u php-src/ext/mbstring/mbstring.h:1.61 php-src/ext/mbstring/mbstring.h:1.62 --- php-src/ext/mbstring/mbstring.h:1.61Wed Oct 22 10:14:05 2003 +++ php-src/ext/mbstring/mbstring.h Tue Dec 2 03:54:39 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: mbstring.h,v 1.61 2003/10/22 14:14:05 hirokawa Exp $ */ +/* $Id: mbstring.h,v 1.62 2003/12/02 08:54:39 wez Exp $ */ /* * PHP4 Multibyte String module mbstring (currently only for Japanese) @@ -55,8 +55,10 @@ # undef MBSTRING_API # ifdef MBSTRING_EXPORTS # define MBSTRING_API __declspec(dllexport) -# else +# elif defined(COMPILE_DL_MBSTRING) # define MBSTRING_API __declspec(dllimport) +# else +# define MBSTRING_API /* nothing special */ # endif #else # undef MBSTRING_API -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/iconv iconv.c /ext/standard quot_print.c quot_print.h
On Tue, 2 Dec 2003, Moriyoshi Koizumi wrote: moriyoshi Tue Dec 2 02:36:43 2003 EDT Modified files: /php-src/ext/standard quot_print.c quot_print.h /php-src/ext/iconviconv.c Log: all '_' (underscores) should be replaced by '\x20' (whitespaces) in encoding. # should I bump API version? Only if you merge it to PHP_4_3 ... Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/qtdom .cvsignore CREDITS EXPERIMENTAL config.m4 qtdom.c qtdom.h qtdom.php qtdom_qt.cpp qtdom_qt.h
sniper Tue Dec 2 08:55:28 2003 EDT Removed files: /php-src/ext/qtdom .cvsignore CREDITS EXPERIMENTAL config.m4 qtdom.c qtdom.h qtdom.php qtdom_qt.cpp qtdom_qt.h Modified files: /php-srcNEWS Log: Moved qtdom to PECL Index: php-src/NEWS diff -u php-src/NEWS:1.1515 php-src/NEWS:1.1516 --- php-src/NEWS:1.1515 Mon Dec 1 17:46:45 2003 +++ php-src/NEWSTue Dec 2 08:55:27 2003 @@ -2,7 +2,8 @@ ||| ?? Oct 2003, PHP 5 Beta 3 - Moved extensions to PECL: - . ext/db (Jani) + . ext/db (Jani, Derick) + . ext/qtdom (Jani, Derick) - Added possibility to call PHP functions as XSLT-functions. (Christian) - Added possibility to prevent PHP from registering variables when input filter support is used. (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / EXTENSIONS
sniper Tue Dec 2 09:48:23 2003 EDT Modified files: /php-srcEXTENSIONS Log: removed some non-existing extensions/sapis Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.63 php-src/EXTENSIONS:1.64 --- php-src/EXTENSIONS:1.63 Mon Oct 13 05:32:59 2003 +++ php-src/EXTENSIONS Tue Dec 2 09:48:22 2003 @@ -27,25 +27,33 @@ == Server APIs == --- -EXTENSION: aolserver -MAINTENANCE: Unknown -STATUS: Unknown EXTENSION: activescript PRIMARY MAINTAINER: Wez Furlong [EMAIL PROTECTED] MAINTENANCE: Odd Fixes STATUS: Experimental --- +EXTENSION: aolserver +MAINTENANCE: Unknown +STATUS: Unknown +--- EXTENSION: apache PRIMARY MAINTAINER: Rasmus Lerdorf [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working --- -EXTENSION: apache2 +EXTENSION: apache2handler / apache2filter PRIMARY MAINTAINER: Aaron Bannert [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Experimental --- +EXTENSION: apache_hooks +MAINTENANCE: Unknown +STATUS: Unknown +--- +EXTENSION: caudium +MAINTENANCE: Unknown +STATUS: Unknown +--- EXTENSION: cgi MAINTENANCE: Unknown STATUS: Working @@ -55,14 +63,19 @@ STATUS: Working SINCE: 4.3.0 --- -EXTENSION: fhttpd -MAINTENANCE: Unknown -STATUS: Unknown +EXTENSION: embed +PRIMARY MAINTAINER: Edin Kadribasic [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working --- EXTENSION: isapi MAINTENANCE: Unknown STATUS: Working --- +EXTENSION: milter +MAINTENANCE: Unknown +STATUS: Unknown +--- EXTENSION: nsapi PRIMARY MAINTAINER: Uwe Schindler [EMAIL PROTECTED] MAINTENANCE: Maintained @@ -80,12 +93,12 @@ MAINTENANCE: Unknown STATUS: Unknown --- -EXTENSION: servlet -PRIMARY MAINTAINER: Sam Ruby [EMAIL PROTECTED] -MAINTENANCE: Maintained +EXTENSION: thttpd +PRIMARY MAINTAINER: Sascha Schumann [EMAIL PROTECTED] +MAINTENANCE: Odd fixes STATUS: Working --- -EXTENSION: thttpd +EXTENSION: tux MAINTENANCE: Unknown STATUS: Unknown --- @@ -121,10 +134,10 @@ MAINTENANCE: Unknown STATUS: Unknown --- -EXTENSION: hyperwave +EXTENSION: hwapi PRIMARY MAINTAINER: Uwe Steinmann [EMAIL PROTECTED] -MAINTENANCE: Maintained -STATUS: Working +MAINTENANCE: Unknown +STATUS: Unknown --- EXTENSION: informix PRIMARY MAINTAINER: Danny Heijl [EMAIL PROTECTED] @@ -146,12 +159,6 @@ MAINTENANCE: Unknown STATUS: Working --- -EXTENSION: msession -PRIMARY MAINTAINER Mark L. Woodward [EMAIL PROTECTED] -MAINTENANCE: Maintained -STATUS: Working/Experimental -COMMENT: Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows. EXTENSION: mssql PRIMARY MAINTAINER: Frank M. Kromann [EMAIL PROTECTED] MAINTENANCE: Maintained @@ -250,11 +257,6 @@ == Other extensions == --- -EXTENSION: aspell
[PHP-CVS] cvs: php-src /ext/standard credits_ext.h credits_sapi.h
sniper Tue Dec 2 09:50:38 2003 EDT Modified files: /php-src/ext/standard credits_ext.h credits_sapi.h Log: - Updated credits Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.20 php-src/ext/standard/credits_ext.h:1.21 --- php-src/ext/standard/credits_ext.h:1.20 Mon Aug 18 19:31:14 2003 +++ php-src/ext/standard/credits_ext.h Tue Dec 2 09:50:37 2003 @@ -21,7 +21,6 @@ CREDIT_LINE(cURL, Sterling Hughes); CREDIT_LINE(DBA, Sascha Schumann, Marcus Boerger); CREDIT_LINE(dBase, Jim Winstead); -CREDIT_LINE(DBM, Rasmus Lerdorf, Jim Winstead, Marcus Boerger); CREDIT_LINE(dbx (database abstraction), Marc Boeren, Rui Hirokawa, Frank M. Kromann); CREDIT_LINE(DOM, Christian Stocker, Rob Richards, Marcus Boerger); CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger); @@ -41,6 +40,7 @@ CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev, Ard Biesheuvel); CREDIT_LINE(IRCG, Sascha Schumann); CREDIT_LINE(LDAP, Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig Venaas); +CREDIT_LINE(LIBXML, Christian Stocker, Rob Richards, Marcus Boerger, Wez Furlong, Shane Caraveo); CREDIT_LINE(MCAL, Mark Musone, Chuck Hagenbuch); CREDIT_LINE(mcrypt, Sascha Schumann, Derick Rethans); CREDIT_LINE(MCVE, Brad House, Chris Faulhaber, Steven Schoch); @@ -49,12 +49,12 @@ CREDIT_LINE(MING, Dave Hayden, Frank M. Kromann); CREDIT_LINE(mnoGoSearch, Sergey Kartashoff, Alex Barkov, Ramil Kalimullin); CREDIT_LINE(mono, Sterling Hughes); -CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(msession, Mark L. Woodward); CREDIT_LINE(mSQL, Zeev Suraski); +CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa); -CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); CREDIT_LINE(MySQLi, Zak Greant, Georg Richter); +CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); CREDIT_LINE(ncurses, Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter); CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky); CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky); @@ -67,7 +67,6 @@ CREDIT_LINE(Posix, Kristian Köhntopp); CREDIT_LINE(PostgreSQL, Jouni Ahto, Zeev Suraski, Yasuo Ohgaki); CREDIT_LINE(Pspell, Vlad Krupin); -CREDIT_LINE(qtdom, Jan Borsodi); CREDIT_LINE(Readline, Thies C. Arntzen); CREDIT_LINE(Recode, Kristian Köhntopp); CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski); @@ -75,7 +74,7 @@ CREDIT_LINE(simplexml, Sterling Hughes); CREDIT_LINE(SNMP, Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven Lawrance, Johann Hanne); CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, Jason Greene); -CREDIT_LINE(sqlite, Wez Furlong, Tal Peer, Marcus Börger); +CREDIT_LINE(sqlite, Wez Furlong, Tal Peer, Marcus Börger, Ilia Alshanetsky); CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe); CREDIT_LINE(Sybase-DB, Zeev Suraski); CREDIT_LINE(System V Message based IPC, Wez Furlong); @@ -85,8 +84,8 @@ CREDIT_LINE(Verisign Payflow Pro, John Donagher, David Croft); CREDIT_LINE(W32API, James Moore); CREDIT_LINE(WDDX, Andrei Zmievski); -CREDIT_LINE(XML, Stig Bakken, Thies C. Arntzen, Sterling Hughes); CREDIT_LINE(xmlrpc, Dan Libby); +CREDIT_LINE(XML, Stig Bakken, Thies C. Arntzen, Sterling Hughes); CREDIT_LINE(XSL, Christian Stocker, Rob Richards); CREDIT_LINE(YAZ, Adam Dickmeiss); CREDIT_LINE(Yellow Pages, Stephanie Wehner, Fredrik Ohrn); Index: php-src/ext/standard/credits_sapi.h diff -u php-src/ext/standard/credits_sapi.h:1.13 php-src/ext/standard/credits_sapi.h:1.14 --- php-src/ext/standard/credits_sapi.h:1.13Mon Mar 3 19:10:10 2003 +++ php-src/ext/standard/credits_sapi.h Tue Dec 2 09:50:37 2003 @@ -21,7 +21,6 @@ CREDIT_LINE(CLI, Edin Kadribasic, Marcus Boerger); CREDIT_LINE(Embed, Edin Kadribasic); CREDIT_LINE(ISAPI, Andi Gutmans, Zeev Suraski); -CREDIT_LINE(Java Servlet, Sam Ruby); CREDIT_LINE(NSAPI, Jayakumar Muthukumarasamy, Uwe Schindler); CREDIT_LINE(phttpd, Thies C. Arntzen); CREDIT_LINE(pi3web, Holger Zimmermann); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/iconv iconv.c /ext/standard quot_print.c quot_print.h
On 2003/12/02, at 20:27, Derick Rethans wrote: On Tue, 2 Dec 2003, Moriyoshi Koizumi wrote: # should I bump API version? Only if you merge it to PHP_4_3 ... Okay, so seems I don't need to bump it since that function only exists in HEAD. Moriyoshi Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c
rrichards Tue Dec 2 10:09:36 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/domxml php_domxml.c Log: Fix bug 26443: No errror reporting for Errors in the domxml extension Index: php-src/ext/domxml/php_domxml.c diff -u php-src/ext/domxml/php_domxml.c:1.218.2.40 php-src/ext/domxml/php_domxml.c:1.218.2.41 --- php-src/ext/domxml/php_domxml.c:1.218.2.40 Mon Dec 1 11:19:15 2003 +++ php-src/ext/domxml/php_domxml.c Tue Dec 2 10:09:31 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_domxml.c,v 1.218.2.40 2003/12/01 16:19:15 rrichards Exp $ */ +/* $Id: php_domxml.c,v 1.218.2.41 2003/12/02 15:09:31 rrichards Exp $ */ /* TODO * - Support Notation Nodes @@ -1670,6 +1670,9 @@ REGISTER_LONG_CONSTANT(DOMXML_LOAD_COMPLETE_ATTRS,DOMXML_LOAD_COMPLETE_ATTRS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(DOMXML_LOAD_DONT_KEEP_BLANKS,DOMXML_LOAD_DONT_KEEP_BLANKS, CONST_CS | CONST_PERSISTENT); xmlSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error); +#if (defined(LIBXML_THREAD_ENABLED) LIBXML_VERSION = 20510) + xmlThrDefSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error); +#endif #if HAVE_DOMXSLT xsltSetGenericErrorFunc(xsltGenericErrorContext, (xmlGenericErrorFunc)domxml_error); #if HAVE_DOMEXSLT -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.h
Its not really needed; its something I came across with the new build system for php5 while building mbstring into php5.dll --Wez. - Original Message - From: Moriyoshi Koizumi [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Tuesday, December 02, 2003 2:52 PM Subject: Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.h MFH? Moriyoshi On 2003/12/02, at 17:54, Wez Furlong wrote: wez Tue Dec 2 03:54:40 2003 EDT Modified files: /php-src/ext/mbstring mbstring.h Log: Fix MBSTRING_API for non-shared win32 builds -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams xp_socket.c
wez Tue Dec 2 11:35:20 2003 EDT
Modified files:
/php-src/main/streams xp_socket.c
Log:
this can't be persistent
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.19 php-src/main/streams/xp_socket.c:1.20
--- php-src/main/streams/xp_socket.c:1.19 Sun Nov 30 14:43:30 2003
+++ php-src/main/streams/xp_socket.cTue Dec 2 11:35:19 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.19 2003/11/30 19:43:30 iliaa Exp $ */
+/* $Id: xp_socket.c,v 1.20 2003/12/02 16:35:19 wez Exp $ */
#include php.h
#include ext/standard/file.h
@@ -632,7 +632,7 @@
if (clisock = 0) {
php_netstream_data_t *clisockdata;
- clisockdata = pemalloc(sizeof(*clisockdata), stream-is_persistent);
+ clisockdata = emalloc(sizeof(*clisockdata));
if (clisockdata == NULL) {
close(clisock);
@@ -643,6 +643,7 @@
xparam-outputs.client = php_stream_alloc_rel(stream-ops,
clisockdata, NULL, r+);
if (xparam-outputs.client) {
+ /* TODO: addref ? */
xparam-outputs.client-context = stream-context;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
jon Tue Dec 2 11:50:03 2003 EDT Modified files: /php-srcconfigure.in Log: Improving the wording of the don't use the DB extension warning. Index: php-src/configure.in diff -u php-src/configure.in:1.479 php-src/configure.in:1.480 --- php-src/configure.in:1.479 Mon Dec 1 10:17:06 2003 +++ php-src/configure.inTue Dec 2 11:50:02 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.479 2003/12/01 15:17:06 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.480 2003/12/02 16:50:02 jon Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1319,9 +1319,9 @@ ++ |*** WARNING *** | || -| You chose to compile PHP with DB extension. This extension is | +| You chose to compile PHP with the DB extension. This extension is | | deprecated and does not support database locking correctly. Please | -| use DBA extension which is a fully operational superset. | +| use the DBA extension, which is a fully operational superset. | X fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
andiTue Dec 2 12:50:49 2003 EDT Modified files: /CVSROOTavail Log: - Give Wez and Ilia access to CVSROOT so that they can fix up some of the - pecl extension's layout. Index: CVSROOT/avail diff -u CVSROOT/avail:1.774 CVSROOT/avail:1.775 --- CVSROOT/avail:1.774 Wed Nov 5 04:37:51 2003 +++ CVSROOT/avail Tue Dec 2 12:50:48 2003 @@ -12,7 +12,7 @@ # Some people also have access to the configuration files in the # CVSROOT. -avail|sterling,goba,imajes|CVSROOT +avail|sterling,goba,imajes,wez,iliaa|CVSROOT # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in
Might as well remove it, the extension went to la-la-land. :) --Jani On Tue, 2 Dec 2003, Jon Parise wrote: jonTue Dec 2 11:50:03 2003 EDT Modified files: /php-src configure.in Log: Improving the wording of the don't use the DB extension warning. Index: php-src/configure.in diff -u php-src/configure.in:1.479 php-src/configure.in:1.480 --- php-src/configure.in:1.479 Mon Dec 1 10:17:06 2003 +++ php-src/configure.in Tue Dec 2 11:50:02 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.479 2003/12/01 15:17:06 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.480 2003/12/02 16:50:02 jon Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1319,9 +1319,9 @@ ++ |*** WARNING *** | || -| You chose to compile PHP with DB extension. This extension is | +| You chose to compile PHP with the DB extension. This extension is | | deprecated and does not support database locking correctly. Please | -| use DBA extension which is a fully operational superset. | +| use the DBA extension, which is a fully operational superset. | X fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mssql php_mssql.c
fmk Tue Dec 2 13:37:51 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mssql php_mssql.c
Log:
set freed pointer to null to avoid reuse
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.26 php-src/ext/mssql/php_mssql.c:1.86.2.27
--- php-src/ext/mssql/php_mssql.c:1.86.2.26 Mon Nov 17 15:53:28 2003
+++ php-src/ext/mssql/php_mssql.c Tue Dec 2 13:37:50 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.26 2003/11/17 20:53:28 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.27 2003/12/02 18:37:50 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -162,6 +162,7 @@
}
if (MS_SQL_G(server_message)) {
STR_FREE(MS_SQL_G(server_message));
+ MS_SQL_G(server_message) = NULL;
}
MS_SQL_G(server_message) = estrdup(msgtext);
return 0;
@@ -345,6 +346,7 @@
STR_FREE(MS_SQL_G(appname));
if (MS_SQL_G(server_message)) {
STR_FREE(MS_SQL_G(server_message));
+ MS_SQL_G(server_message) = NULL;
}
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Tue Dec 2 13:38:30 2003 EDT
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
set freed pointer to null to avoid reuse
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.125 php-src/ext/mssql/php_mssql.c:1.126
--- php-src/ext/mssql/php_mssql.c:1.125 Mon Nov 17 15:56:53 2003
+++ php-src/ext/mssql/php_mssql.c Tue Dec 2 13:38:30 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.125 2003/11/17 20:56:53 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.126 2003/12/02 18:38:30 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -164,6 +164,7 @@
}
if (MS_SQL_G(server_message)) {
STR_FREE(MS_SQL_G(server_message));
+ MS_SQL_G(server_message) = NULL;
}
MS_SQL_G(server_message) = estrdup(msgtext);
return 0;
@@ -347,6 +348,7 @@
STR_FREE(MS_SQL_G(appname));
if (MS_SQL_G(server_message)) {
STR_FREE(MS_SQL_G(server_message));
+ MS_SQL_G(server_message) = NULL;
}
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams userspace.c
pollita Tue Dec 2 13:52:59 2003 EDT
Modified files:
/php-src/main/streams userspace.c
Log:
Update userspace/url_stat proto
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.10 php-src/main/streams/userspace.c:1.11
--- php-src/main/streams/userspace.c:1.10 Sat Sep 13 11:27:08 2003
+++ php-src/main/streams/userspace.cTue Dec 2 13:52:58 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.10 2003/09/13 15:27:08 abies Exp $ */
+/* $Id: userspace.c,v 1.11 2003/12/02 18:52:58 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -32,7 +32,7 @@
};
static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, char *filename,
char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC
TSRMLS_DC);
-static int user_wrapper_stat_url(php_stream_wrapper *wrapper, char *url,
php_stream_statbuf *ssb TSRMLS_DC);
+static int user_wrapper_stat_url(php_stream_wrapper *wrapper, char *url, int flags,
php_stream_statbuf *ssb, php_stream_context *context TSRMLS_DC);
static int user_wrapper_unlink(php_stream_wrapper *wrapper, char *url, int options,
php_stream_context *context TSRMLS_DC);
static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, char *filename,
char *mode,
int options, char **opened_path, php_stream_context *context
STREAMS_DC TSRMLS_DC);
@@ -145,7 +145,7 @@
return array( just like that returned by fstat() );
}
- function url_stat(string $url)
+ function url_stat(string $url, int $flags)
{
return array( just like that returned by stat() );
}
@@ -766,11 +766,11 @@
return ret;
}
-static int user_wrapper_stat_url(php_stream_wrapper *wrapper, char *url,
php_stream_statbuf *ssb TSRMLS_DC)
+static int user_wrapper_stat_url(php_stream_wrapper *wrapper, char *url, int flags,
php_stream_statbuf *ssb, php_stream_context *context TSRMLS_DC)
{
struct php_user_stream_wrapper *uwrap = (struct
php_user_stream_wrapper*)wrapper-abstract;
- zval *zfilename, *zfuncname, *zretval;
- zval **args[1];
+ zval *zfilename, *zfuncname, *zretval, *zflags;
+ zval **args[2];
int call_result;
zval *object;
int ret = -1;
@@ -788,6 +788,10 @@
ZVAL_STRING(zfilename, url, 1);
args[0] = zfilename;
+ MAKE_STD_ZVAL(zflags);
+ ZVAL_LONG(zflags, flags);
+ args[1] = zflags;
+
MAKE_STD_ZVAL(zfuncname);
ZVAL_STRING(zfuncname, USERSTREAM_STATURL, 1);
@@ -795,7 +799,7 @@
object,
zfuncname,
zretval,
- 1, args,
+ 2, args,
0, NULL TSRMLS_CC);
if (call_result == SUCCESS zretval != NULL Z_TYPE_P(zretval) ==
IS_ARRAY) {
@@ -816,6 +820,7 @@
zval_ptr_dtor(zfuncname);
zval_ptr_dtor(zfilename);
+ zval_ptr_dtor(zflags);
return ret;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams userspace.c
pollita Tue Dec 2 14:14:32 2003 EDT
Modified files:
/php-src/main/streams userspace.c
Log:
Populate userstream objects with context property
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.11 php-src/main/streams/userspace.c:1.12
--- php-src/main/streams/userspace.c:1.11 Tue Dec 2 13:52:58 2003
+++ php-src/main/streams/userspace.cTue Dec 2 14:14:31 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.11 2003/12/02 18:52:58 pollita Exp $ */
+/* $Id: userspace.c,v 1.12 2003/12/02 19:14:31 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -284,7 +284,7 @@
{
struct php_user_stream_wrapper *uwrap = (struct
php_user_stream_wrapper*)wrapper-abstract;
php_userstream_data_t *us;
- zval *zfilename, *zoptions, *zretval = NULL, *zfuncname;
+ zval *zfilename, *zoptions, *zretval = NULL, *zfuncname, *zcontext;
zval **args[2];
int call_result;
php_stream *stream = NULL;
@@ -304,6 +304,17 @@
object_init_ex(us-object, uwrap-ce);
ZVAL_REFCOUNT(us-object) = 1;
PZVAL_IS_REF(us-object) = 1;
+
+ if (context) {
+ MAKE_STD_ZVAL(zcontext);
+ php_stream_context_to_zval(context, zcontext);
+ add_property_zval(us-object, context, zcontext);
+ /* The object property should be the only reference,
+ 'get rid' of our local reference. */
+ zval_ptr_dtor(zcontext);
+ } else {
+ add_property_null(us-object, context);
+ }
/* call it's dir_open method - set up params first */
MAKE_STD_ZVAL(zfilename);
@@ -722,7 +733,7 @@
static int user_wrapper_unlink(php_stream_wrapper *wrapper, char *url, int options,
php_stream_context *context TSRMLS_DC)
{
struct php_user_stream_wrapper *uwrap = (struct
php_user_stream_wrapper*)wrapper-abstract;
- zval *zfilename, *zfuncname, *zretval;
+ zval *zfilename, *zfuncname, *zretval, *zcontext;
zval **args[1];
int call_result;
zval *object;
@@ -734,6 +745,17 @@
ZVAL_REFCOUNT(object) = 1;
PZVAL_IS_REF(object) = 1;
+ if (context) {
+ MAKE_STD_ZVAL(zcontext);
+ php_stream_context_to_zval(context, zcontext);
+ add_property_zval(object, context, zcontext);
+ /* The object property should be the only reference,
+ 'get rid' of our local reference. */
+ zval_ptr_dtor(zcontext);
+ } else {
+ add_property_null(object, context);
+ }
+
/* call the unlink method */
MAKE_STD_ZVAL(zfilename);
ZVAL_STRING(zfilename, url, 1);
@@ -769,7 +791,7 @@
static int user_wrapper_stat_url(php_stream_wrapper *wrapper, char *url, int flags,
php_stream_statbuf *ssb, php_stream_context *context TSRMLS_DC)
{
struct php_user_stream_wrapper *uwrap = (struct
php_user_stream_wrapper*)wrapper-abstract;
- zval *zfilename, *zfuncname, *zretval, *zflags;
+ zval *zfilename, *zfuncname, *zretval, *zflags, *zcontext;
zval **args[2];
int call_result;
zval *object;
@@ -781,6 +803,17 @@
ZVAL_REFCOUNT(object) = 1;
PZVAL_IS_REF(object) = 1;
+ if (context) {
+ MAKE_STD_ZVAL(zcontext);
+ php_stream_context_to_zval(context, zcontext);
+ add_property_zval(object, context, zcontext);
+ /* The object property should be the only reference,
+ 'get rid' of our local reference. */
+ zval_ptr_dtor(zcontext);
+ } else {
+ add_property_null(object, context);
+ }
+
/* call the stat_url method */
/* call it's stream_open method - set up params first */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c php_network.h
wez Tue Dec 2 18:13:44 2003 EDT
Modified files:
/php-src/main network.c php_network.h
Log:
Export these so that ftp extension can be build as shared ext.
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.105 php-src/main/network.c:1.106
--- php-src/main/network.c:1.105Sun Nov 30 14:43:28 2003
+++ php-src/main/network.c Tue Dec 2 18:13:43 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.105 2003/11/30 19:43:28 iliaa Exp $ */
+/* $Id: network.c,v 1.106 2003/12/02 23:13:43 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -856,7 +856,7 @@
/* {{{ php_any_addr
* Fills the any (wildcard) address into php_sockaddr_storage
*/
-void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port)
+PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port)
{
memset(addr, 0, sizeof(php_sockaddr_storage));
switch (family) {
@@ -883,7 +883,7 @@
/* {{{ php_sockaddr_size
* Returns the size of struct sockaddr_xx for the family
*/
-int php_sockaddr_size(php_sockaddr_storage *addr)
+PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr)
{
switch (((struct sockaddr *)addr)-sa_family) {
case AF_INET:
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.46 php-src/main/php_network.h:1.47
--- php-src/main/php_network.h:1.46 Sat Nov 29 16:46:49 2003
+++ php-src/main/php_network.h Tue Dec 2 18:13:43 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_network.h,v 1.46 2003/11/29 21:46:49 wez Exp $ */
+/* $Id: php_network.h,v 1.47 2003/12/02 23:13:43 wez Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -153,8 +153,8 @@
socklen_t *addrlen
TSRMLS_DC);
-void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port);
-int php_sockaddr_size(php_sockaddr_storage *addr);
+PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port);
+PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr);
struct _php_netstream_data_t {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session php_session.h session.c
wez Tue Dec 2 18:14:31 2003 EDT
Modified files:
/php-src/ext/sessionphp_session.h session.c
Log:
Export this so that shared session modules can use it under win32.
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.94 php-src/ext/session/php_session.h:1.95
--- php-src/ext/session/php_session.h:1.94 Tue Jun 10 16:03:36 2003
+++ php-src/ext/session/php_session.h Tue Dec 2 18:14:31 2003
@@ -32,7 +32,7 @@
#define PS_CREATE_SID_ARGS void **mod_data, int *newlen TSRMLS_DC
/* default create id function */
-char *php_session_create_id(PS_CREATE_SID_ARGS);
+PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS);
typedef struct ps_module_struct {
const char *s_name;
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.377 php-src/ext/session/session.c:1.378
--- php-src/ext/session/session.c:1.377 Wed Oct 8 06:22:51 2003
+++ php-src/ext/session/session.c Tue Dec 2 18:14:31 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.377 2003/10/08 10:22:51 sniper Exp $ */
+/* $Id: session.c,v 1.378 2003/12/02 23:14:31 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -589,7 +589,7 @@
return out;
}
-char *php_session_create_id(PS_CREATE_SID_ARGS)
+PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
{
PHP_MD5_CTX md5_context;
PHP_SHA1_CTX sha1_context;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / .cvsignore buildconf.bat /ext/bcmath config.w32 /ext/calendar config.w32 /ext/com_dotnet config.w32 /ext/ctype config.w32 /ext/dom config.w32 /ext/ftp config.w32 /ext/libxml config.w32 /ext/mbstring config.w32 /ext/odbc config.w32 /ext/pcre config.w32 /ext/session config.w32 /ext/simplexml config.w32 /ext/sqlite config.w32 /ext/standard config.w32 /ext/tokenizer config.w32 /ext/wddx config.w32 /ext/xml config.w32 /ext/zlib config.w32 /sapi/apache config.w32 /sapi/cgi config.w32 /sapi/cli config.w32 /sapi/isapi config.w32 /win32/build Makefile buildconf.js config.w32 config.w32.h.in configure.tail confutils.js
wez Tue Dec 2 18:17:05 2003 EDT
Added files:
/php-srcbuildconf.bat
/php-src/ext/bcmath config.w32
/php-src/ext/calendar config.w32
/php-src/ext/com_dotnet config.w32
/php-src/ext/ctype config.w32
/php-src/ext/domconfig.w32
/php-src/ext/ftpconfig.w32
/php-src/ext/libxml config.w32
/php-src/ext/mbstring config.w32
/php-src/ext/odbc config.w32
/php-src/ext/pcre config.w32
/php-src/ext/sessionconfig.w32
/php-src/ext/simplexml config.w32
/php-src/ext/sqlite config.w32
/php-src/ext/standard config.w32
/php-src/ext/tokenizer config.w32
/php-src/ext/wddx config.w32
/php-src/ext/xmlconfig.w32
/php-src/ext/zlib config.w32
/php-src/sapi/apacheconfig.w32
/php-src/sapi/cgi config.w32
/php-src/sapi/cli config.w32
/php-src/sapi/isapi config.w32
/php-src/win32/buildMakefile buildconf.js config.w32
config.w32.h.in configure.tail confutils.js
Modified files:
/php-src.cvsignore
Log:
Add new (optional!) win32 build infrastructure.
Will follow up to internals@ shortly.
Index: php-src/.cvsignore
diff -u php-src/.cvsignore:1.47 php-src/.cvsignore:1.48
--- php-src/.cvsignore:1.47 Tue Jul 23 09:50:04 2002
+++ php-src/.cvsignore Tue Dec 2 18:16:47 2003
@@ -60,3 +60,5 @@
.FBCLockFolder
debug.log
confdefs.h
+configure.js
+config.nice.bat
Index: php-src/buildconf.bat
+++ php-src/buildconf.bat
@echo off
cscript /nologo win32\build\buildconf.js
Index: php-src/ext/bcmath/config.w32
+++ php-src/ext/bcmath/config.w32
// $Id: config.w32,v 1.1 2003/12/02 23:16:48 wez Exp $
// vim:ft=javascript
ARG_ENABLE(bcmath, bc style precision math functions, yes);
if (PHP_BCMATH == yes) {
EXTENSION(bcmath, bcmath.c, null, -Iext/bcmath/libbcmath/src);
ADD_SOURCES(ext/bcmath/libbcmath/src, add.c div.c init.c neg.c \
outofmem.c raisemod.c rt.c sub.c compare.c divmod.c int2num.c \
num2long.c output.c recmul.c sqrt.c zero.c debug.c doaddsub.c \
nearzero.c num2str.c raise.c rmzero.c str2num.c, bcmath);
AC_DEFINE('WITH_BCMATH', 1, 'Have BCMATH library');
}
Index: php-src/ext/calendar/config.w32
+++ php-src/ext/calendar/config.w32
// $Id: config.w32,v 1.1 2003/12/02 23:16:49 wez Exp $
// vim:ft=javascript
ARG_ENABLE(calendar, calendar conversion support, yes);
if (PHP_CALENDAR == yes) {
EXTENSION(calendar, calendar.c dow.c french.c gregor.c jewish.c \
julian.c easter.c cal_unix.c);
AC_DEFINE('HAVE_CALENDAR', 1, 'Have calendar');
}
Index: php-src/ext/com_dotnet/config.w32
+++ php-src/ext/com_dotnet/config.w32
// $Id: config.w32,v 1.1 2003/12/02 23:16:50 wez Exp $
// vim:ft=javascript
ARG_ENABLE(com_dotnet, COM and .Net support, yes);
if (PHP_COM_DOTNET == yes) {
EXTENSION(com_dotnet, com_com.c com_dotnet.c com_extension.c \
com_handlers.c com_iterator.c com_misc.c com_olechar.c \
com_typeinfo.c com_variant.c);
AC_DEFINE('HAVE_COM_DOTNET', 1, 'Have COM_DOTNET support');
// TODO: do a header check for this
AC_DEFINE('HAVE_MSCOREE_H', 0, 'Have .net headers');
}
Index: php-src/ext/ctype/config.w32
+++ php-src/ext/ctype/config.w32
// $Id: config.w32,v 1.1 2003/12/02 23:16:51 wez Exp $
// vim:ft=javascript
ARG_ENABLE(ctype, ctype, yes);
if (PHP_CTYPE == yes) {
EXTENSION(ctype, ctype.c);
AC_DEFINE('HAVE_CTYPE', 1, 'Have ctype');
}
Index: php-src/ext/dom/config.w32
+++ php-src/ext/dom/config.w32
// $Id: config.w32,v 1.1 2003/12/02 23:16:52 wez Exp $
// vim:ft=javascript
ARG_WITH(dom, DOM support, yes);
if (PHP_DOM == yes PHP_LIBXML == yes) {
EXTENSION(dom, php_dom.c attr.c document.c domerrorhandler.c \
domstringlist.c domexception.c namelist.c processinginstruction.c \
cdatasection.c documentfragment.c domimplementation.c element.c \
node.c string_extend.c characterdata.c documenttype.c \
domimplementationlist.c entity.c nodelist.c text.c comment.c \
domconfiguration.c domimplementationsource.c entityreference.c \
notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \
domlocator.c namednodemap.c userdatahandler.c);
AC_DEFINE(HAVE_DOM, 1, DOM support);
}
Index: php-src/ext/ftp/config.w32
+++ php-src/ext/ftp/config.w32
// $Id: config.w32,v 1.1 2003/12/02 23:16:52 wez Exp $
// vim:ft=javascript
ARG_ENABLE(ftp, ftp support, yes);
if (PHP_FTP == yes) {
EXTENSION(ftp, php_ftp.c ftp.c);
AC_DEFINE('HAVE_FTP', 1, 'Have FTP support');
}
Index: php-src/ext/libxml/config.w32
+++ php-src/ext/libxml/config.w32
// $Id: config.w32,v 1.1 2003/12/02 23:16:53 wez Exp $
// vim:ft=javascript
ARG_WITH(libxml, LibXML support,
[PHP-CVS] cvs: php-src /sapi/apache config.w32
wez Tue Dec 2 19:27:45 2003 EDT
Modified files:
/php-src/sapi/apacheconfig.w32
Log:
Fix build if you don't have apache headers and want to disable apache...
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.1 php-src/sapi/apache/config.w32:1.2
--- php-src/sapi/apache/config.w32:1.1 Tue Dec 2 18:17:02 2003
+++ php-src/sapi/apache/config.w32 Tue Dec 2 19:27:44 2003
@@ -1,39 +1,40 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/02 23:17:02 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/03 00:27:44 wez Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'yes');
ARG_WITH('apache-includes', 'Where to find Apache 1.3 headers', null);
ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null);
-if (PHP_APACHE_INCLUDES == null) {
- if (FSO.FileExists('C:\\Program Files\\Apache
Group\\Apache\\include\\httpd.h')) {
- PHP_APACHE_INCLUDES = C:\\Program Files\\Apache
Group\\Apache\\include;
- } else if (FSO.FileExists(PHP_PHP_BUILD + \\apache\\src\\include\\httpd.h)) {
- PHP_APACHE_INCLUDES = PHP_PHP_BUILD + \\apache\\src\\include;
+if (PHP_APACHE == yes) {
+
+ if (PHP_APACHE_INCLUDES == null) {
+ if (FSO.FileExists('C:\\Program Files\\Apache
Group\\Apache\\include\\httpd.h')) {
+ PHP_APACHE_INCLUDES = C:\\Program Files\\Apache
Group\\Apache\\include;
+ } else if (FSO.FileExists(PHP_PHP_BUILD +
\\apache\\src\\include\\httpd.h)) {
+ PHP_APACHE_INCLUDES = PHP_PHP_BUILD + \\apache\\src\\include;
+ }
}
-}
-if (!FSO.FileExists(PHP_APACHE_INCLUDES + \\httpd.h)) {
- ERROR(Could not find apache headers);
-}
+ if (!FSO.FileExists(PHP_APACHE_INCLUDES + \\httpd.h)) {
+ ERROR(Could not find apache headers);
+ }
-if (PHP_APACHE_LIBS == null) {
- if (FSO.FileExists('C:\\Program Files\\Apache
Group\\Apache\\libexec\\ApacheCore.lib')) {
- PHP_APACHE_LIBS = C:\\Program Files\\Apache Group\\Apache\\libexec;
- } else if (FSO.FileExists(PHP_PHP_BUILD +
\\apache\\src\\corer\\ApacheCore.lib)) {
- PHP_APACHE_LIBS = PHP_PHP_BUILD + \\apache\\src\\corer;
+ if (PHP_APACHE_LIBS == null) {
+ if (FSO.FileExists('C:\\Program Files\\Apache
Group\\Apache\\libexec\\ApacheCore.lib')) {
+ PHP_APACHE_LIBS = C:\\Program Files\\Apache
Group\\Apache\\libexec;
+ } else if (FSO.FileExists(PHP_PHP_BUILD +
\\apache\\src\\corer\\ApacheCore.lib)) {
+ PHP_APACHE_LIBS = PHP_PHP_BUILD + \\apache\\src\\corer;
+ }
}
-}
-if (!FSO.FileExists(PHP_APACHE_LIBS + \\ApacheCore.lib)) {
- ERROR(Could not find apache libraries);
-}
+ if (!FSO.FileExists(PHP_APACHE_LIBS + \\ApacheCore.lib)) {
+ ERROR(Could not find apache libraries);
+ }
-if (PHP_APACHE == yes) {
SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
- 'php' + PHP_VERSION + 'apache.dll',
- '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I ' + PHP_APACHE_INCLUDES
+ '');
+ 'php' + PHP_VERSION + 'apache.dll',
+ '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I ' +
PHP_APACHE_INCLUDES + '');
ADD_FLAG('LIBS_APACHE', '/libpath:' + PHP_APACHE_LIBS + ' ApacheCore.lib');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fbsql config.w32
fmk Tue Dec 2 19:30:55 2003 EDT
Added files:
/php-src/ext/fbsql config.w32
Log:
Adding FrontBase config file for the new build system
Index: php-src/ext/fbsql/config.w32
+++ php-src/ext/fbsql/config.w32
// $Id: config.w32,v 1.1 2003/12/03 00:30:54 fmk Exp $
// vim:ft=javascript
ARG_WITH(fbsql, FrontBase support, no);
if (PHP_FBSQL == yes) {
EXTENSION(fbsql, php_fbsql.c);
AC_DEFINE('HAVE_FBSQL', 1, 'Have FrontBase support');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/shmop config.w32
iliaa Tue Dec 2 19:32:19 2003 EDT
Added files:
/php-src/ext/shmop config.w32
Log:
Adding shmop config file for the new build system
Index: php-src/ext/shmop/config.w32
+++ php-src/ext/shmop/config.w32
// $Id: config.w32,v 1.1 2003/12/03 00:32:19 iliaa Exp $
// vim:ft=javascript
ARG_ENABLE(shmop, shmop support, no);
if (PHP_SHMOP == yes) {
EXTENSION(shmop, shmop.c);
AC_DEFINE('HAVE_SHMOP', 1, 'Have SHMOP support');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.WIN32-BUILD-SYSTEM
wez Tue Dec 2 19:32:26 2003 EDT Added files: /php-srcREADME.WIN32-BUILD-SYSTEM Log: add win32 build readme Index: php-src/README.WIN32-BUILD-SYSTEM +++ php-src/README.WIN32-BUILD-SYSTEM I've committed the build infrastructure for the real programmers don't need an IDE build system for win32. Why? - It's frustrating to have to use VC6 to work on PHP if you have a newer version that has incompatible project files. - It's annoying to mess around with libxml2 stuff until it stabilizes :-) and a pain to have to remember to edit the config.w32.h header each time, and a pain to have to avoid accidentally committing those changes each time. - It's difficult to set up a fully working build environment for PHP without installing everything. - It's difficult for people without VC6 to create a win32 project file for their extensions. Requirements: You need windows script host (cscript.exe) and JScript installed. This should be a standard config on windows machines since win98 (perhaps optional under win98). You also need the Microsoft build tools (cl.exe, link.exe and nmake.exe). These are freely available as part of the Platform SDK, but also come with VC++/Visual Studio. Finally, you need the php_build dir that contains all the headers and libraries for the things that php is linked against; see [1] for details. Usage: Check out PHP 5 and run buildconf.bat from the root of the php source. This script is roughly equivalent to the unix buildconf in that it scans ext/* and sapi/* for config.w32 files describing optional build components and generates a configure script named configure.js Now run cscript configure.js --help to get a list of configure options; enable and disable stuff as appropriate. Then type nmake to build the things you configured. You will find the various .exe and .dll files in the build dir that configure selects for you based on debug and zts settings; it will be one of the usual Debug_TS, Release_TS, Debug or Release dirs found under the source root. You can also run the test suite by running nmake test. [we have some issues under win32 with current CVS!] TODO: - Write config.w32 files for more extensions and sapis. They're quite easy (just a couple of javascript function calls) and can be put together almost without thinking by copying the guts of the config.m4 file from the same extension. - add those .rc files with version info the generated .dll's and .exe's - Test if it actually works under win98 (Steph?) There are only two places that I suspect might have difficulty under win98. [1] http://www.php.net/manual/en/install.windows.php#install.windows.build -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 2 19:46:40 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
make help more useful
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.2 php-src/win32/build/config.w32:1.3
--- php-src/win32/build/config.w32:1.2 Tue Dec 2 19:15:10 2003
+++ php-src/win32/build/config.w32 Tue Dec 2 19:46:40 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2003/12/03 00:15:10 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/03 00:46:40 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -85,7 +85,7 @@
// Find the php_build dir - it contains headers and libraries
// that we need
-ARG_WITH('php-build', 'Where the php_build dir can be found. Assumes that it is a
sibling of this source dir (..\\php_build) if not specified', 'no');
+ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source
dir (..\\php_build) if not specified', 'no');
if (PHP_PHP_BUILD == no) {
if (FSO.FolderExists(..\\php_build)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Tue Dec 2 19:56:15 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Avoid death when wrapping null/undefined values
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.2 php-src/win32/build/confutils.js:1.3
--- php-src/win32/build/confutils.js:1.2Tue Dec 2 19:15:10 2003
+++ php-src/win32/build/confutils.jsTue Dec 2 19:56:14 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.2 2003/12/03 00:15:10 wez Exp $
+// $Id: confutils.js,v 1.3 2003/12/03 00:56:14 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -88,6 +88,10 @@
function word_wrap_and_indent(indent, text, line_suffix, indent_char)
{
+ if (text == null) {
+ return ;
+ }
+
var words = text.split(new RegExp(\\s+, g));
var i = 0;
var ret_text = ;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 2 20:10:05 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
avoid vs.net specific option for now
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.3 php-src/win32/build/config.w32:1.4
--- php-src/win32/build/config.w32:1.3 Tue Dec 2 19:46:40 2003
+++ php-src/win32/build/config.w32 Tue Dec 2 20:10:03 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2003/12/03 00:46:40 wez Exp $
+// $Id: config.w32,v 1.4 2003/12/03 01:10:03 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -54,7 +54,9 @@
} else {
// Equivalent to Release_TSInline build - best optimization
ADD_FLAG(CFLAGS, /LD /MD /W3 /O2 /D NDebug /D NDEBUG \
-/D ZEND_WIN32_FORCE_INLINE /GB /GF /GS /D ZEND_DEBUG=0);
+/D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0);
+ // if you have VS.Net /GS hardens the binary against buffer overruns
+ // ADD_FLAG(CFLAGS, /GS);
}
if (PHP_ZTS == yes) {
@@ -94,7 +96,7 @@
}
if (!FSO.FolderExists(PHP_PHP_BUILD)) {
- ERROR(Could not find the php_build dir; please specify it\r\n\
+ WARNING(Could not find the php_build dir; please specify it\r\n\
using the --with-php-build option to configure);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
pollita Tue Dec 2 20:11:37 2003 EDT
Modified files:
/php-src/ext/standard string.c
Log:
Restore ability to use strrpos/strripos with an ordinal needle
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.402 php-src/ext/standard/string.c:1.403
--- php-src/ext/standard/string.c:1.402 Mon Dec 1 18:17:22 2003
+++ php-src/ext/standard/string.c Tue Dec 2 20:11:36 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.402 2003/12/01 23:17:22 iliaa Exp $ */
+/* $Id: string.c,v 1.403 2003/12/03 01:11:36 pollita Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1570,14 +1570,26 @@
Finds position of last occurrence of a string within another string */
PHP_FUNCTION(strrpos)
{
+ zval *zneedle;
char *needle, *haystack;
int needle_len, haystack_len, offset = 0;
- char *p, *e;
+ char *p, *e, ord_needle[2];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss|l, haystack,
haystack_len, needle, needle_len, offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz|l, haystack,
haystack_len, zneedle, offset) == FAILURE) {
RETURN_FALSE;
}
+ if (Z_TYPE_P(zneedle) == IS_STRING) {
+ needle = Z_STRVAL_P(zneedle);
+ needle_len = Z_STRLEN_P(zneedle);
+ } else {
+ convert_to_long(zneedle);
+ ord_needle[0] = (char)(Z_LVAL_P(zneedle) 0xFF);
+ ord_needle[1] = '\0';
+ needle = ord_needle;
+ needle_len = 1;
+ }
+
if ((haystack_len == 0) || (needle_len == 0)) {
RETURN_FALSE;
}
@@ -1609,15 +1621,27 @@
Finds position of last occurrence of a string within another string */
PHP_FUNCTION(strripos)
{
+ zval *zneedle;
char *needle, *haystack;
int needle_len, haystack_len, offset = 0;
- char *p, *e;
+ char *p, *e, ord_needle[2];
char *needle_dup, *haystack_dup;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss|l, haystack,
haystack_len, needle, needle_len, offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz|l, haystack,
haystack_len, zneedle, offset) == FAILURE) {
RETURN_FALSE;
}
+ if (Z_TYPE_P(zneedle) == IS_STRING) {
+ needle = Z_STRVAL_P(zneedle);
+ needle_len = Z_STRLEN_P(zneedle);
+ } else {
+ convert_to_long(zneedle);
+ ord_needle[0] = (char)(Z_LVAL_P(zneedle) 0xFF);
+ ord_needle[1] = '\0';
+ needle = ord_needle;
+ needle_len = 1;
+ }
+
if ((haystack_len == 0) || (needle_len == 0)) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
pollita Tue Dec 2 20:31:57 2003 EDT
Modified files:
/php-src/ext/standard string.c
Log:
Optimize strrpos/strripos for single char strings and fix offset to report correctly
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.403 php-src/ext/standard/string.c:1.404
--- php-src/ext/standard/string.c:1.403 Tue Dec 2 20:11:36 2003
+++ php-src/ext/standard/string.c Tue Dec 2 20:31:56 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.403 2003/12/03 01:11:36 pollita Exp $ */
+/* $Id: string.c,v 1.404 2003/12/03 01:31:56 pollita Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1606,9 +1606,20 @@
}
}
+ if (needle_len == 1) {
+ /* Single character search can shortcut memcmps */
+ while (e = p) {
+ if (*e == *needle) {
+ RETURN_LONG(e - p + (offset 0 ? offset : 0));
+ }
+ e--;
+ }
+ RETURN_FALSE;
+ }
+
while (e = p) {
if (memcmp(e, needle, needle_len) == 0) {
- RETURN_LONG(e - p);
+ RETURN_LONG(e - p + (offset 0 ? offset : 0));
}
e--;
}
@@ -1646,6 +1657,27 @@
RETURN_FALSE;
}
+ if (needle_len == 1) {
+ /* Single character search can shortcut memcmps
+ Can also avoid tolower emallocs */
+ if (offset = 0) {
+ p = haystack + offset;
+ e = haystack + haystack_len - 1;
+ } else {
+ p = haystack;
+ e = haystack + haystack_len - offset;
+ }
+ /* Borrow that ord_needle buffer to avoid repeatedly tolower()ing
needle */
+ *ord_needle = tolower(*needle);
+ while (e = p) {
+ if (tolower(*e) == *ord_needle) {
+ RETURN_LONG(e - p + (offset 0 ? offset : 0));
+ }
+ e--;
+ }
+ RETURN_FALSE;
+ }
+
needle_dup = estrndup(needle, needle_len);
php_strtolower(needle_dup, needle_len);
haystack_dup = estrndup(haystack, haystack_len);
@@ -1667,7 +1699,7 @@
if (memcmp(e, needle_dup, needle_len) == 0) {
efree(haystack_dup);
efree(needle_dup);
- RETURN_LONG(e - p);
+ RETURN_LONG(e - p + (offset 0 ? offset : 0));
}
e--;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml config.w32 /ext/zlib config.w32 /sapi/apache config.w32 /win32/build config.w32 confutils.js
wez Tue Dec 2 21:47:46 2003 EDT
Modified files:
/php-src/ext/libxml config.w32
/php-src/ext/zlib config.w32
/php-src/sapi/apacheconfig.w32
/php-src/win32/buildconfig.w32 confutils.js
Log:
some tweaks for Frank
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.1 php-src/ext/libxml/config.w32:1.2
--- php-src/ext/libxml/config.w32:1.1 Tue Dec 2 18:16:53 2003
+++ php-src/ext/libxml/config.w32 Tue Dec 2 21:47:43 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:53 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/03 02:47:43 wez Exp $
// vim:ft=javascript
ARG_WITH(libxml, LibXML support, yes);
@@ -6,7 +6,10 @@
if (PHP_LIBXML == yes) {
EXTENSION(libxml, libxml.c, false /* never shared */);
AC_DEFINE(HAVE_LIBXML, 1, LibXML support);
- ADD_FLAG(LIBS_LIBXML, libxml2.lib iconv.lib);
+
+ CHECK_LIB(iconv.lib, libxml, php_usual_lib_suspects);
+ CHECK_LIB(libxml2.lib, libxml, php_usual_lib_suspects);
+ CHECK_HEADER_ADD_INCLUDE(libxml/parser.h, CFLAGS,
php_usual_include_suspects);
}
Index: php-src/ext/zlib/config.w32
diff -u php-src/ext/zlib/config.w32:1.1 php-src/ext/zlib/config.w32:1.2
--- php-src/ext/zlib/config.w32:1.1 Tue Dec 2 18:17:01 2003
+++ php-src/ext/zlib/config.w32 Tue Dec 2 21:47:44 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:17:01 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/03 02:47:44 wez Exp $
// vim:ft=javascript
ARG_ENABLE(zlib, ZLIB support, yes);
@@ -6,7 +6,8 @@
if (PHP_ZLIB == yes) {
EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c, null, /D ZLIB_EXPORTS);
AC_DEFINE(HAVE_ZLIB, 1, Tokenizer support);
- ADD_FLAG(LIBS_ZLIB, zlib.lib);
+ CHECK_LIB(zlib.lib, zlib, ..\\zlib; + php_usual_lib_suspects);
+ CHECK_HEADER_ADD_INCLUDE(zlib.h, CFLAGS, ..\\zlib; +
php_usual_include_suspects);
}
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.2 php-src/sapi/apache/config.w32:1.3
--- php-src/sapi/apache/config.w32:1.2 Tue Dec 2 19:27:44 2003
+++ php-src/sapi/apache/config.w32 Tue Dec 2 21:47:45 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2003/12/03 00:27:44 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/03 02:47:45 wez Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'yes');
@@ -8,33 +8,19 @@
if (PHP_APACHE == yes) {
- if (PHP_APACHE_INCLUDES == null) {
- if (FSO.FileExists('C:\\Program Files\\Apache
Group\\Apache\\include\\httpd.h')) {
- PHP_APACHE_INCLUDES = C:\\Program Files\\Apache
Group\\Apache\\include;
- } else if (FSO.FileExists(PHP_PHP_BUILD +
\\apache\\src\\include\\httpd.h)) {
- PHP_APACHE_INCLUDES = PHP_PHP_BUILD + \\apache\\src\\include;
- }
- }
-
- if (!FSO.FileExists(PHP_APACHE_INCLUDES + \\httpd.h)) {
+ if (!CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE,
php_usual_include_suspects +
+ ;C:\\Program Files\\Apache Group\\Apache\\include +
+ ;..\\php_build\\apache\\src\\include)) {
ERROR(Could not find apache headers);
}
- if (PHP_APACHE_LIBS == null) {
- if (FSO.FileExists('C:\\Program Files\\Apache
Group\\Apache\\libexec\\ApacheCore.lib')) {
- PHP_APACHE_LIBS = C:\\Program Files\\Apache
Group\\Apache\\libexec;
- } else if (FSO.FileExists(PHP_PHP_BUILD +
\\apache\\src\\corer\\ApacheCore.lib)) {
- PHP_APACHE_LIBS = PHP_PHP_BUILD + \\apache\\src\\corer;
- }
- }
-
- if (!FSO.FileExists(PHP_APACHE_LIBS + \\ApacheCore.lib)) {
+ if (!CHECK_LIB(ApacheCore.lib, apache, php_usual_lib_suspects +
+ ';C:\\Program Files\\Apache Group\\Apache\\libexec' +
+ ';..\\php_build\\apache\\src\\corer')) {
ERROR(Could not find apache libraries);
}
-
SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
'php' + PHP_VERSION + 'apache.dll',
- '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I ' +
PHP_APACHE_INCLUDES + '');
- ADD_FLAG('LIBS_APACHE', '/libpath:' + PHP_APACHE_LIBS + ' ApacheCore.lib');
+ '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H');
}
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.4 php-src/win32/build/config.w32:1.5
--- php-src/win32/build/config.w32:1.4 Tue Dec 2 20:10:03 2003
+++ php-src/win32/build/config.w32 Tue Dec 2 21:47:45 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.4 2003/12/03 01:10:03 wez Exp $
+// $Id: config.w32,v 1.5 2003/12/03 02:47:45 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -19,8 +19,7 @@
// Configures the hard-coded installation dir
[PHP-CVS] cvs: php-src / configure.in
jon Wed Dec 3 00:06:11 2003 EDT Modified files: /php-srcconfigure.in Log: Removing the DB extension warning message. The DB extension is no longer included in the PHP distribution. Index: php-src/configure.in diff -u php-src/configure.in:1.480 php-src/configure.in:1.481 --- php-src/configure.in:1.480 Tue Dec 2 11:50:02 2003 +++ php-src/configure.inWed Dec 3 00:06:04 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.480 2003/12/02 16:50:02 jon Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.481 2003/12/03 05:06:04 jon Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1314,17 +1314,6 @@ X fi - if test $PHP_DB != no; then -cat X -++ -|*** WARNING *** | -|| -| You chose to compile PHP with the DB extension. This extension is | -| deprecated and does not support database locking correctly. Please | -| use the DBA extension, which is a fully operational superset. | -X - fi - # Warn about linking Apache with libpthread if oci8 extension is enabled on linux. if test $PHP_OCI8 != no -o $PHP_ORACLE != no; then if test $PHP_SAPI = apache; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard http_fopen_wrapper.c
pollita Wed Dec 3 00:30:17 2003 EDT
Modified files:
/php-src/ext/standard http_fopen_wrapper.c
/php-srcNEWS
Log:
Add http proxy support via context option.
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.76
php-src/ext/standard/http_fopen_wrapper.c:1.77
--- php-src/ext/standard/http_fopen_wrapper.c:1.76 Thu Aug 28 12:28:33 2003
+++ php-src/ext/standard/http_fopen_wrapper.c Wed Dec 3 00:30:15 2003
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.76 2003/08/28 16:28:33 sas Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.77 2003/12/03 05:30:15 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -134,7 +134,16 @@
else if (resource-port == 0)
resource-port = 80;
- transport_len = spprintf(transport_string, 0, %s://%s:%d, use_ssl ? ssl :
tcp, resource-host, resource-port);
+ if (context !use_ssl
+ php_stream_context_get_option(context, http, proxy, tmpzval) ==
SUCCESS
+ Z_TYPE_PP(tmpzval) == IS_STRING
+ Z_STRLEN_PP(tmpzval) 0) {
+ /* Don't use proxy server for SSL resources */
+ transport_len = Z_STRLEN_PP(tmpzval);
+ transport_string = estrndup(Z_STRVAL_PP(tmpzval),
Z_STRLEN_PP(tmpzval));
+ } else {
+ transport_len = spprintf(transport_string, 0, %s://%s:%d, use_ssl ?
ssl : tcp, resource-host, resource-port);
+ }
stream = php_stream_xport_create(transport_string, transport_len, options,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT,
Index: php-src/NEWS
diff -u php-src/NEWS:1.1516 php-src/NEWS:1.1517
--- php-src/NEWS:1.1516 Tue Dec 2 08:55:27 2003
+++ php-src/NEWSWed Dec 3 00:30:16 2003
@@ -8,6 +8,7 @@
- Added possibility to prevent PHP from registering variables when
input filter support is used. (Derick)
- Added EXSLT support in ext/xsl. (Christian)
+- Added proxy support to http wrapper. (Sara)
- Added new functions:
. dba_key_split() to split inifile keys in an array. (Marcus)
. time_nanosleep() signal safe sleep (Magnus, Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in
Hello Jon, how about moving the lines to ext/db in PECL? Wednesday, December 3, 2003, 6:06:11 AM, you wrote: jon Wed Dec 3 00:06:11 2003 EDT Modified files: /php-src configure.in Log: Removing the DB extension warning message. The DB extension is no longer included in the PHP distribution. Index: php-src/configure.in diff -u php-src/configure.in:1.480 php-src/configure.in:1.481 --- php-src/configure.in:1.480Tue Dec 2 11:50:02 2003 +++ php-src/configure.in Wed Dec 3 00:06:04 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.480 2003/12/02 16:50:02 jon Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.481 2003/12/03 05:06:04 jon Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1314,17 +1314,6 @@ X fi - if test $PHP_DB != no; then -cat X -++ -|*** WARNING *** | -|| -| You chose to compile PHP with the DB extension. This extension is | -| deprecated and does not support database locking correctly. Please | -| use the DBA extension, which is a fully operational superset. | -X - fi - # Warn about linking Apache with libpthread if oci8 extension is enabled on linux. if test $PHP_OCI8 != no -o $PHP_ORACLE != no; then if test $PHP_SAPI = apache; then -- Best regards, Marcusmailto:[EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mssql config.w32
fmk Wed Dec 3 01:50:20 2003 EDT
Modified files:
/php-src/ext/mssql config.w32
Log:
Adding missing defines and lib/include paths
Index: php-src/ext/mssql/config.w32
diff -u php-src/ext/mssql/config.w32:1.2 php-src/ext/mssql/config.w32:1.3
--- php-src/ext/mssql/config.w32:1.2Tue Dec 2 19:22:40 2003
+++ php-src/ext/mssql/config.w32Wed Dec 3 01:50:19 2003
@@ -1,9 +1,13 @@
-// $Id: config.w32,v 1.2 2003/12/03 00:22:40 fmk Exp $
+// $Id: config.w32,v 1.3 2003/12/03 06:50:19 fmk Exp $
// vim:ft=javascript
ARG_WITH(mssql, mssql support, no);
if (PHP_MSSQL == yes) {
EXTENSION(mssql, php_mssql.c);
+ CHECK_LIB(ntwdblib.lib, mssql, \\MSSQL7\\DevTools\\Lib);
+ CHECK_HEADER_ADD_INCLUDE(sqlfront.h, CFLAGS);
+ AC_DEFINE('DBNTWIN32', 1, '');
+ AC_DEFINE('MSSQL70', 1, '');
AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
