[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c datetime.c datetime.h
sterlingWed Sep 29 00:57:19 2004 EDT
Modified files:
/php-srcconfigure.in
/php-src/ext/standard basic_functions.c datetime.c datetime.h
Log:
Add strptime function.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.518r2=1.519ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.518 php-src/configure.in:1.519
--- php-src/configure.in:1.518 Sat Sep 25 21:10:05 2004
+++ php-src/configure.inWed Sep 29 00:57:18 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.518 2004/09/26 01:10:05 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.519 2004/09/29 04:57:18 sterling Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -548,6 +548,7 @@
strdup \
strerror \
strftime \
+strptime \
strstr \
strtok_r \
symlink \
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.690r2=1.691ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.690
php-src/ext/standard/basic_functions.c:1.691
--- php-src/ext/standard/basic_functions.c:1.690Sun Sep 26 17:55:21 2004
+++ php-src/ext/standard/basic_functions.c Wed Sep 29 00:57:18 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.690 2004/09/26 21:55:21 helly Exp $ */
+/* $Id: basic_functions.c,v 1.691 2004/09/29 04:57:18 sterling Exp $ */
#include php.h
#include php_streams.h
@@ -170,7 +170,9 @@
PHP_FE(time,
NULL)
PHP_FE(mktime,
NULL)
PHP_FE(gmmktime,
NULL)
-
+#if HAVE_STRPTIME
+ PHP_FE(strptime,
NULL)
+#endif
#if HAVE_STRFTIME
PHP_FE(strftime,
NULL)
PHP_FE(gmstrftime,
NULL)
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.123r2=1.124ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.123 php-src/ext/standard/datetime.c:1.124
--- php-src/ext/standard/datetime.c:1.123 Sat Sep 25 11:26:55 2004
+++ php-src/ext/standard/datetime.c Wed Sep 29 00:57:19 2004
@@ -18,7 +18,11 @@
+--+
*/
-/* $Id: datetime.c,v 1.123 2004/09/25 15:26:55 hyanantha Exp $ */
+/* $Id: datetime.c,v 1.124 2004/09/29 04:57:19 sterling Exp $ */
+
+#if HAVE_STRPTIME
+#define _XOPEN_SOURCE
+#endif
#include php.h
#include zend_operators.h
@@ -1094,6 +1098,41 @@
}
/* }}} */
+#if HAVE_STRPTIME
+/* {{{ proto string strptime(string timestamp, string format)
+ Parse a time/date generated with strftime() */
+PHP_FUNCTION(strptime)
+{
+ char *ts;
+ intts_length;
+ char *format;
+ intformat_length;
+ struct tm parsed_time;
+ char *unparsed_part;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss,
+ ts, ts_length, format, format_length) == FAILURE) {
+ return;
+ }
+
+ unparsed_part = strptime(ts, format, parsed_time);
+ if (unparsed_part == NULL) {
+ RETURN_FALSE;
+ }
+
+ array_init(return_value);
+ add_assoc_long(return_value, tm_sec, parsed_time.tm_sec);
+ add_assoc_long(return_value, tm_min, parsed_time.tm_min);
+ add_assoc_long(return_value, tm_hour, parsed_time.tm_hour);
+ add_assoc_long(return_value, tm_mday, parsed_time.tm_mday);
+ add_assoc_long(return_value, tm_mon, parsed_time.tm_mon);
+ add_assoc_long(return_value, tm_year, parsed_time.tm_year);
+ add_assoc_long(return_value, tm_wday, parsed_time.tm_wday);
+ add_assoc_long(return_value, tm_yday, parsed_time.tm_yday);
+ add_assoc_string(return_value, unparsed, unparsed_part, 1);
+}
+/* }}} */
+#endif
/*
* Local variables:
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.h?r1=1.16r2=1.17ty=u
Index: php-src/ext/standard/datetime.h
diff -u php-src/ext/standard/datetime.h:1.16 php-src/ext/standard/datetime.h:1.17
--- php-src/ext/standard/datetime.h:1.16Thu Jan 8 12:32:51 2004
+++ php-src/ext/standard/datetime.h Wed Sep 29 00:57:19 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: datetime.h,v 1.16 2004/01/08
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
Ilia Alshanetsky wrote: I understand that the PDF extension does not work with the latest version of libpdf, however to my knowledge it works fine with the 5.X series of the library, which is still quite popular. It seems to me that removing a mostly working and a reasonably popular extension from a stable tree is not a good idea, especially this late in the release cycle. +1 I think this decisions needs reconsidered or at the very least discussed further. I think having PDFLib in there without newer support is *exactly* the point of maintaining an old release while developing on the new release. PHP4 is there regardless of whether or not its perfect, and it won't be having any major functionality changes or new ways of viewing the world. -Sterling -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl multi.c
sterlingFri Sep 10 16:36:46 2004 EDT
Modified files:
/php-src/ext/curl multi.c
Log:
fix wrong check from return value, binary content should not be \0'd,
non-binary content should be \0'd.
http://cvs.php.net/diff.php/php-src/ext/curl/multi.c?r1=1.16r2=1.17ty=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.16 php-src/ext/curl/multi.c:1.17
--- php-src/ext/curl/multi.c:1.16 Wed Mar 10 19:27:16 2004
+++ php-src/ext/curl/multi.cFri Sep 10 16:36:45 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: multi.c,v 1.16 2004/03/11 00:27:16 iliaa Exp $ */
+/* $Id: multi.c,v 1.17 2004/09/10 20:36:45 sterling Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -195,7 +195,7 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, z_ch, -1, le_curl_name, le_curl);
if (ch-handlers-write-method == PHP_CURL_RETURN
ch-handlers-write-buf.len 0) {
- if (ch-handlers-write-type == PHP_CURL_BINARY) {
+ if (ch-handlers-write-type != PHP_CURL_BINARY) {
smart_str_0(ch-handlers-write-buf);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard http_fopen_wrapper.c
Sascha Schumann wrote: HTTP/1.1 supports compressing, which is good to save bandwidth. As does HTTP/1.0. Refer to RFC 1945, section 3.5 Content Codings. As the code is only in HEAD, there is no real problem, because untill PHP 5.1 goes out, I'll test this extensively :) That is quite optimistic. If someone needs HTTP/1.1 support, he can use curl, or call wget, or whatever. There is no reason we would need to add this feature to PHP's standard set of features. Yep. -Sterling -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard http_fopen_wrapper.c
Sacha- I can appreciate that there is a limited potential need for PHP to support chunked encoding right-now, however this is one step in a larger process to support keep-alives and issuing multiple requests over a single http/https session. I'd like to work on the issues raised by Nuno: (A) being minor, and (B) being (seemingly) unrelated to chunked-encoding itself. If the release cycle starts to approach and we're no better off then obviously this can and should be torn out in the name of stability. The reason I'm against these changes is that simple HTTP support is fine, but when it comes to getting more complex support written by PHP it makes very little sense to me to not use some external library (e.g. cURL). Supporting these features properly, completely, with multiple browsers is too large a code size to duplicate within PHP itself, simple support is one thing, but I think its wrong to get more advanced in this respect. _Sterling -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Unmasking the error handler (was Re: [PHP-CVS] cvs: php-src /ext/dom document.c)
Derick Rethans wrote: On Wed, 25 Aug 2004, Sterling Hughes wrote: That's wrong. You should *never* require an E_WARNING to be sent without being able to silence it, especially not on something so unimportant. It's just as wrong as trying to parse non-wellformed XML. Then don't add the feature. There are things that extensions are allowed to do (throw a warning), and there are things that extensions should not be allowed to do, unmasking the error handler is one such thing. IMNSHO, that is a technical limitation for any extension distributed with PHP. -Sterling -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/dom document.c
That's wrong. You should *never* require an E_WARNING to be sent without being able to silence it, especially not on something so unimportant. -Sterling On Wed, 25 Aug 2004 17:29:37 +0200 (CEST), Derick Rethans [EMAIL PROTECTED] wrote: On Wed, 25 Aug 2004, Sterling Hughes wrote: Christian Stocker wrote: chregu Wed Aug 25 04:27:07 2004 EDT Modified files: /php-src/ext/domdocument.c Log: if $doc-recover = true; set error_reporting to (old | E_WARNING) This way, you can't silence XML parse errors with the @ character Why this change? http://blog.bitflux.ch/p1757.html, http://blog.bitflux.ch/p1760.html and http://www.derickrethans.nl/month-2004-08.php?item=200408250958#200408250958 Derick -- http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/simplexml simplexml.c
pls change to registerXpathNs or registerXpathNamespace().
-sterling
Christian Stocker wrote:
chregu Sun Jul 25 07:02:43 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/simplexml simplexml.c
Log:
added new method SimpleXMLElement-registerNamespace(string prefix, string uri)
registers a prefix - namespaceURI combination for use in a later xpath query.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1773r2=1.1774ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1773 php-src/NEWS:1.1774
--- php-src/NEWS:1.1773 Sat Jul 24 00:01:48 2004
+++ php-src/NEWS Sun Jul 25 07:02:42 2004
@@ -13,6 +13,7 @@
. array_intersect_ukey() (Christiano Duarte)
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
+ . SimpleXMLElement-registerNamespace() (Christian)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.139r2=1.140ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.139 php-src/ext/simplexml/simplexml.c:1.140
--- php-src/ext/simplexml/simplexml.c:1.139 Tue May 4 11:03:48 2004
+++ php-src/ext/simplexml/simplexml.c Sun Jul 25 07:02:43 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.139 2004/05/04 15:03:48 wez Exp $ */
+/* $Id: simplexml.c,v 1.140 2004/07/25 11:02:43 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -843,6 +843,29 @@
xmlXPathFreeObject(retval);
}
+
+SXE_METHOD(registerNamespace)
+{
+ php_sxe_object*sxe;
+ zval *id;
+ int prefix_len, ns_uri_len;
+ char *prefix, *ns_uri;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, prefix, prefix_len, ns_uri, ns_uri_len) == FAILURE) {
+ return;
+ }
+
+ sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
+ if (!sxe-xpath) {
+ sxe-xpath = xmlXPathNewContext((xmlDocPtr) sxe-document-ptr);
+ }
+
+ if (xmlXPathRegisterNs(sxe-xpath, prefix, ns_uri) != 0) {
+ RETURN_FALSE
+ }
+ RETURN_TRUE;
+}
+
/* }}} */
/* {{{ proto asXML([string filename])
@@ -1604,6 +1627,7 @@
SXE_ME(__construct,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must be called */
SXE_ME(asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath, NULL, ZEND_ACC_PUBLIC)
+ SXE_ME(registerNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
SXE_ME(children, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
@@ -1651,7 +1675,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.139 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.140 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard array.c basic_functions.c php_array.h /ext/standard/tests/array array_diff_key.phpt array_intersect_key.phpt
was there a discussion? On Wed, 21 Jul 2004 21:17:56 -, Andrey Hristov [EMAIL PROTECTED] wrote: andrey Wed Jul 21 17:17:56 2004 EDT Added files: /php-src/ext/standard/tests/array array_intersect_key.phpt array_diff_key.phpt Modified files: /php-srcNEWS /php-src/ext/standard array.c php_array.h basic_functions.c Log: add array_: intersect_key() intersect_ukey() diff_key() diff_ukey() The first two by a patch of Cristiano Duarte. The second two were implemented in almost the same way except one small difference. -- 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/curl curl.c
sterlingThu Jul 1 02:51:48 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/curl curl.c Log: mfh http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.21r2=1.124.2.22ty=u Index: php-src/ext/curl/curl.c diff -u php-src/ext/curl/curl.c:1.124.2.21 php-src/ext/curl/curl.c:1.124.2.22 --- php-src/ext/curl/curl.c:1.124.2.21 Thu May 13 12:54:45 2004 +++ php-src/ext/curl/curl.c Thu Jul 1 02:51:48 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: curl.c,v 1.124.2.21 2004/05/13 16:54:45 edink Exp $ */ +/* $Id: curl.c,v 1.124.2.22 2004/07/01 06:51:48 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -938,7 +938,7 @@ error = curl_formadd(first, last, CURLFORM_COPYNAME, string_key, CURLFORM_NAMELENGTH, string_key_len - 1, - (ZVAL_REFCOUNT(*zvalue) 1 ? CURLFORM_PTRCONTENTS : CURLFORM_COPYCONTENTS), postval, + CURLFORM_COPYCONTENTS, postval, CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current), CURLFORM_END); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests 001.phpt 002.phpt 003.phpt 004.phpt 007.phpt 008.phpt 009.phpt 010.phpt 014.phpt 014a.phpt 014b.phpt 015.phpt 016.phpt
wtf? -sterling On Mar 29, 2004, at 11:58 AM, Marcus Boerger wrote: helly Mon Mar 29 14:58:01 2004 EDT Modified files: /php-src/ext/simplexml simplexml.c /php-src/ext/simplexml/tests001.phpt 002.phpt 003.phpt 004.phpt 007.phpt 008.phpt 009.phpt 010.phpt 014.phpt 014a.phpt 014b.phpt 015.phpt 016.phpt Log: Fix class names helly-20040329145801.txt-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c php_curl.h
sterlingFri Mar 12 13:38:00 2004 EDT
Modified files:
/php-src/ext/curl interface.c php_curl.h
Log:
add the curl_copy_handle() function which will exactly duplicate a cURL handle.
Useful when you have multiple similair transforms as with a multi handle with
only small variances (like the URL)
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.40r2=1.41ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.40 php-src/ext/curl/interface.c:1.41
--- php-src/ext/curl/interface.c:1.40 Fri Mar 12 12:37:04 2004
+++ php-src/ext/curl/interface.cFri Mar 12 13:37:55 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.40 2004/03/12 17:37:04 iliaa Exp $ */
+/* $Id: interface.c,v 1.41 2004/03/12 18:37:55 sterling Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -59,6 +59,7 @@
*/
function_entry curl_functions[] = {
PHP_FE(curl_init,NULL)
+ PHP_FE(curl_copy_handle, NULL)
PHP_FE(curl_version, NULL)
PHP_FE(curl_setopt, NULL)
PHP_FE(curl_exec,NULL)
@@ -780,6 +781,40 @@
}
/* }}} */
+/* {{{ proto resource curl_copy_handle(resource ch)
+ Copy a cURL handle along with all of it's preferences */
+PHP_FUNCTION(curl_copy_handle)
+{
+ zval *zid;
+ CURL *cp;
+ php_curl *ch;
+ php_curl *dupch;
+
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, zid) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+ ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+
+ cp = curl_easy_duphandle(ch-cp);
+ if (!cp) {
+ php_error(E_WARNING, Cannot duplicate cURL handle);
+ RETURN_FALSE;
+ }
+
+ alloc_curl_handle(dupch);
+ TSRMLS_SET_CTX(ch-thread_ctx);
+
+ dupch-cp = cp;
+ dupch-handlers-write-method = ch-handlers-write-method;
+ dupch-handlers-write-type = ch-handlers-write-type;
+ dupch-handlers-read-method = ch-handlers-read-method;
+ dupch-handlers-write_header-method = ch-handlers-write_header-method;
+
+ ZEND_REGISTER_RESOURCE(return_value, dupch, le_curl);
+ dupch-id = Z_LVAL_P(return_value);
+}
+/* }}} */
+
/* {{{ proto bool curl_setopt(resource ch, string option, mixed value)
Set an option for a CURL transfer */
PHP_FUNCTION(curl_setopt)
http://cvs.php.net/diff.php/php-src/ext/curl/php_curl.h?r1=1.40r2=1.41ty=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.40 php-src/ext/curl/php_curl.h:1.41
--- php-src/ext/curl/php_curl.h:1.40Wed Mar 10 19:11:18 2004
+++ php-src/ext/curl/php_curl.h Fri Mar 12 13:37:55 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_curl.h,v 1.40 2004/03/11 00:11:18 iliaa Exp $ */
+/* $Id: php_curl.h,v 1.41 2004/03/12 18:37:55 sterling Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -61,6 +61,7 @@
PHP_MINFO_FUNCTION(curl);
PHP_FUNCTION(curl_version);
PHP_FUNCTION(curl_init);
+PHP_FUNCTION(curl_copy_handle);
PHP_FUNCTION(curl_setopt);
PHP_FUNCTION(curl_exec);
PHP_FUNCTION(curl_getinfo);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
sterlingFri Mar 12 13:41:21 2004 EDT
Modified files:
/php-src/ext/curl interface.c
Log:
avoid a memory leak when a php_curl handle is allocated, but the initialization
of a CURL handle fails.
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.41r2=1.42ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.41 php-src/ext/curl/interface.c:1.42
--- php-src/ext/curl/interface.c:1.41 Fri Mar 12 13:37:55 2004
+++ php-src/ext/curl/interface.cFri Mar 12 13:41:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.41 2004/03/12 18:37:55 sterling Exp $ */
+/* $Id: interface.c,v 1.42 2004/03/12 18:41:19 sterling Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -730,20 +730,23 @@
{
zval **url;
php_curl*ch;
+ CURL*cp;
int argc = ZEND_NUM_ARGS();
if (argc 0 || argc 1 || zend_get_parameters_ex(argc, url) == FAILURE) {
WRONG_PARAM_COUNT;
}
- alloc_curl_handle(ch);
- TSRMLS_SET_CTX(ch-thread_ctx);
-
- ch-cp = curl_easy_init();
- if (!ch-cp) {
+ cp = curl_easy_init();
+ if (!cp) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not initialize a
new cURL handle);
RETURN_FALSE;
}
+
+ alloc_curl_handle(ch);
+ TSRMLS_SET_CTX(ch-thread_ctx);
+
+ ch-cp = cp;
ch-handlers-write-method = PHP_CURL_STDOUT;
ch-handlers-write-type = PHP_CURL_ASCII;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
sterlingFri Mar 12 15:04:32 2004 EDT
Modified files:
/php-src/ext/curl interface.c
Log:
zval **, not a zval *
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.42r2=1.43ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.42 php-src/ext/curl/interface.c:1.43
--- php-src/ext/curl/interface.c:1.42 Fri Mar 12 13:41:19 2004
+++ php-src/ext/curl/interface.cFri Mar 12 15:04:31 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.42 2004/03/12 18:41:19 sterling Exp $ */
+/* $Id: interface.c,v 1.43 2004/03/12 20:04:31 sterling Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -788,10 +788,10 @@
Copy a cURL handle along with all of it's preferences */
PHP_FUNCTION(curl_copy_handle)
{
- zval *zid;
- CURL *cp;
- php_curl *ch;
- php_curl *dupch;
+ zval **zid;
+ CURL *cp;
+ php_curl *ch;
+ php_curl *dupch;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, zid) == FAILURE) {
WRONG_PARAM_COUNT;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/curl interface.c multi.c php_curl.h
+ zend_llist_init((*mh).easyh, sizeof(zval *), (llist_dtor_func_t)
ZVAL_PTR_DTOR, 0);
+
why not mh-easyh ?
-sterling
ZEND_REGISTER_RESOURCE(return_value, mh, le_curl_multi_handle);
}
/* }}} */
@@ -86,7 +88,9 @@
_php_curl_cleanup_handle(ch);
ch-uses++;
-
+
+ zend_llist_add_element((*mh).easyh, z_ch);
+
RETURN_LONG((long) curl_multi_add_handle(mh-multi, ch-cp));
}
/* }}} */
@@ -152,7 +156,7 @@
}
/* }}} */
-/* {{{ proto int curl_multi_exec(resource mh)
+/* {{{ proto int curl_multi_exec(resource mh, int still_running)
Run the sub-connections of the current cURL handle */
PHP_FUNCTION(curl_multi_exec)
{
@@ -252,10 +256,10 @@
php_curlm *mh = (php_curlm *) rsrc-ptr;
if (mh) {
curl_multi_cleanup(mh-multi);
+ zend_llist_clean((*mh).easyh);
efree(mh);
rsrc-ptr = NULL;
}
- /* XXX: keep track of all curl handles and zval_ptr_dtor them here */
}
#endif
http://cvs.php.net/diff.php/php-src/ext/curl/php_curl.h?
r1=1.39r2=1.40ty=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.39
php-src/ext/curl/php_curl.h:1.40
--- php-src/ext/curl/php_curl.h:1.39 Thu Jan 8 12:31:54 2004
+++ php-src/ext/curl/php_curl.h Wed Mar 10 19:11:18 2004
@@ -17,7 +17,7 @@
+--
+
*/
-/* $Id: php_curl.h,v 1.39 2004/01/08 17:31:54 sniper Exp $ */
+/* $Id: php_curl.h,v 1.40 2004/03/11 00:11:18 iliaa Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -125,6 +125,7 @@
typedef struct {
intstill_running;
CURLM *multi;
+ zend_llist easyh;
} php_curlm;
void _php_curl_cleanup_handle(php_curl *);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xml compat.c expat_compat.h
What version of libxml2 does this rely on?
-Sterling
chreguSun Feb 22 12:51:02 2004 EDT
Modified files:
/php-src/ext/xml compat.c expat_compat.h
Log:
Fix broken Namespace support, use libxml2 namespace methods instead of
homebrown solution:
- default namespaces are recognized
- different namespaces with same prefix in different nodes are treated correctly
- libxml2 parser warnings are not errors anymore
http://cvs.php.net/diff.php/php-src/ext/xml/compat.c?r1=1.25r2=1.26ty=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.25 php-src/ext/xml/compat.c:1.26
--- php-src/ext/xml/compat.c:1.25 Thu Jan 8 03:17:45 2004
+++ php-src/ext/xml/compat.c Sun Feb 22 12:51:01 2004
@@ -33,119 +33,17 @@
((__ns) != NULL strlen(__ns) == 5 *(__ns) == 'x' *((__ns)+1) == 'm'
\
*((__ns)+2) == 'l' *((__ns)+3) == 'n' *((__ns)+4) == 's')
-static void
-_find_namespace_decl(XML_Parser parser, const xmlChar *tagname, const xmlChar
**attr)
-{
- xmlChar **attr_p = (xmlChar **) attr;
- xmlChar *name;
- xmlChar *value;
- xmlChar *partial;
- xmlChar *namespace;
- php_xml_ns *cur_ns_scope = NULL;
- php_xml_ns *exist_ns_scope;
- xmlNsPtr nsptr, curnsptr;
-
- exist_ns_scope = xmlHashLookup(parser-_reverse_ns_map, tagname);
-
- if (exist_ns_scope) {
- while (exist_ns_scope-next != NULL)
- exist_ns_scope = exist_ns_scope-next;
- }
-
- while (attr_p *attr_p) {
- name = attr_p[0];
- value = xmlStrdup(attr_p[1]);
-
- partial = xmlSplitQName(parser-parser, name, namespace);
-
- if (IS_NS_DECL(namespace)) {
-
- if (parser-h_start_ns) {
- parser-h_start_ns(parser-user, partial, (const
XML_Char *) value);
- }
- if (xmlHashLookup(parser-_ns_map, partial) == NULL) {
- xmlHashAddEntry(parser-_ns_map, partial, value);
- } else {
- xmlFree(value);
- }
-
- nsptr = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
-
- if (nsptr) {
- memset(nsptr, 0, sizeof(xmlNs));
- nsptr-type = XML_LOCAL_NAMESPACE;
-
- if (value != NULL)
- nsptr-href = xmlStrdup(value);
- if (partial != NULL)
- nsptr-prefix = xmlStrdup(partial);
-
- if (cur_ns_scope == NULL) {
- cur_ns_scope = emalloc(sizeof(php_xml_ns));
- cur_ns_scope-next = NULL;
- cur_ns_scope-prev = NULL;
- cur_ns_scope-nsptr = nsptr;
- cur_ns_scope-ref_count = 0;
-
- if (exist_ns_scope) {
- exist_ns_scope-next = cur_ns_scope;
- cur_ns_scope-prev = exist_ns_scope;
- } else {
-
xmlHashAddEntry(parser-_reverse_ns_map, tagname, cur_ns_scope);
- }
-
- exist_ns_scope = cur_ns_scope;
- } else {
- curnsptr = cur_ns_scope-nsptr;
- while (curnsptr-next != NULL) {
- curnsptr = curnsptr-next;
- }
- curnsptr-next = nsptr;
- }
- }
-
- } else {
- xmlFree(value);
- }
-
- xmlFree(partial);
- if (namespace != NULL) {
- xmlFree(namespace);
- }
-
- attr_p += 2;
- }
-
- if (exist_ns_scope) {
- exist_ns_scope-ref_count++;
- }
-}
-
static void
-_qualify_namespace(XML_Parser parser, const xmlChar *name, xmlChar **qualified)
+_qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI,
xmlChar **qualified)
{
- xmlChar *partial;
- xmlChar *namespace;
-
- partial = xmlSplitQName(parser-parser, name, namespace);
- if (namespace) {
- xmlChar *nsvalue;
-
- nsvalue = xmlHashLookup(parser-_ns_map, namespace);
- if (nsvalue) {
+ if (URI) {
/* Use libxml functions otherwise its memory deallocation is
screwed up */
Re: [PHP-CVS] cvs: php-src /ext/xml compat.c expat_compat.h
Mmmh too bad, will try to find a solution for libxml2 2.6 I know, it's late in the release process, but the old implementation didn't recognise default namespaces, which broke quite some ext/xml scripts from php4 days and I'd like to have fixed that before 5.0.0 In the meantime either add #ifdef configure checks or revert it out. Recognizing default namespaces shouldn't be hard to hack in to the code that was there, it just requires a bit of a rethink, and I believe we're set on supporting libxml2.5, right? -Sterling chregu On 2/22/04 7:34 PM, Rob Richards wrote: This change requires libxml 2.6 in order to work (and compile). Rob On Sunday 22 February 2004 01:05 pm, Christian Stocker wrote: Hi mmmh, forget about that... I used 2.6.2, will test on 2.5.10 later chregu On 2/22/04 6:55 PM, Sterling Hughes wrote: What version of libxml2 does this rely on? -- christian stocker | Bitflux GmbH | schoeneggstrasse 5 | ch-8004 zurich phone +41 1 240 56 70 | mobile +41 76 561 88 60 | fax +41 1 240 56 71 http://www.bitflux.ch | [EMAIL PROTECTED] | gnupg-keyid 0x5CE1DECB -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xml compat.c expat_compat.h
Ok there are 5 different solutions now to this problem 1) fix the code, so that it works with 2.5.x correctly as well 2) make 2.6.x a prerequisite 3) disable xml_parser_create_ns for 2.5.x 4) use broken code for 2.5.x and fixed code for 2.6.x 5) revert to yesterdays situation (broken for all...) The ideal solution would be 1), but I'd neither have the time nor am I very keen on doing it. But if someone else wants to fix it, go ahead. I'd prefer 2) or 3). I use 2.6.x since weeks and I don't have any known problems with it. And if we go for 3), anyone who needs xml_parser_create_ns would have to upgrade to 2.6., otherwise you're just fine with 2.5.x. As nobody reported until now, that xml_parser_create_ns is broken since months, I don't think it's a widely used function anyway. Therefore 4) could also be a solution, 'cause x_p_c_ns works ok, if you're namespace declarations are not too uncommon and if you don't use default namespaces (but if you use namespaces, then the chances are pretty high that you also use default namespaces..). 5) is unacceptable, IMHO. 4 for the short-term, 1 for the long-term. I'll fix it, but I don't have time atm. -Sterling What do you think? chregu On 2/22/04 8:10 PM, Rob Richards wrote: On Sunday 22 February 2004 01:36 pm, Sterling Hughes wrote: Mmmh too bad, will try to find a solution for libxml2 2.6 I know, it's late in the release process, but the old implementation didn't recognise default namespaces, which broke quite some ext/xml scripts from php4 days and I'd like to have fixed that before 5.0.0 In the meantime either add #ifdef configure checks or revert it out. Recognizing default namespaces shouldn't be hard to hack in to the code that was there, it just requires a bit of a rethink, and I believe we're set on supporting libxml2.5, right? I personally would like to keep support for libxml 2.5, just because we know it works correctly and stable with the xml extensions and I for one have had little time to extensively test the xml extensions against 2.6.x. Other than that, I have no other reasons for supporting 2.5 However, I believe the namespace support for SAX wasn't introduced or at least wasn't fixed up until 2.6 so the issue may not be able to be fixed without requiring 2.6 That being said, if everyone really wants to require 2.6 I would be fine with it, but we may possibly be introducing new problems and will not be able to fall back to 2.5. From what I have heard from people running 2.6.x have reported, there have been no problems so far, but not sure how heavily they tested everything. Rob -- christian stocker | Bitflux GmbH | schoeneggstrasse 5 | ch-8004 zurich phone +41 1 240 56 70 | mobile +41 76 561 88 60 | fax +41 1 240 56 71 http://www.bitflux.ch | [EMAIL PROTECTED] | gnupg-keyid 0x5CE1DECB -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xml compat.c expat_compat.h
1) fix the code, so that it works with 2.5.x correctly as well 2) make 2.6.x a prerequisite 3) disable xml_parser_create_ns for 2.5.x 4) use broken code for 2.5.x and fixed code for 2.6.x 5) revert to yesterdays situation (broken for all...) I prefer 3. simply add some #id's and be done. If someone fixes it for 2.5 then solution 1) is pretty much nicer - but i doubt anybody has time for that. As far as I'm concerned 3 is not an option. We are not removing namespace support from PHP5 when PHP4 supports it. Broken in cases no one has reported is better than not supported at all. If libxml2.5 is supported there needs to be some sort of solution for namespaces, 1,2,4 and 5 are all fine by me; I prefer a combo of 1 and 4. It will never work correctly for option 1. Namespaces in SAX was a 2.6 thing (SAX2). Right, but namespaces just need to work as good as they did in PHP4, we can't lose that compatibility. If it works better - bonus. I dont like option 4 as if something is going to be implemented it should work the same regardless of libxml version used (which is why I prefer 3 over 4 - feature only available for 2.6.x and up). It looks like the only thing everyone here can agree on then is make 2.6 required and pray we are not introducing new problems. I prefer not to do this, but it may be the only option that everyone can live with. I'm fine with requiring 2.6, although things could blow up. -Sterling -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xml compat.c expat_compat.h
It will never work correctly for option 1. Namespaces in SAX was a 2.6 thing (SAX2). Right, but namespaces just need to work as good as they did in PHP4, we can't lose that compatibility. If it works better - bonus. So what exactly is broken then in comparison to PHP4? From the size of the patch and everything that was replaced, I was assuming quite a bit. And looking at some of the functions added (start_element_ns, etc...) - those are all SAX2 things. Are these needed to get it all working correctly or were those just additional features? If that is the case, then I would definitely agree fixing it for 2.5 is the way to go and not implement the additional features - Arent we in a feature freeze anyways :) (*) I don't think any of that is actually broken with comparison to PHP4 - I think all that breaks in PHP4 too. PHP4 uses the prefix with namespaces as does PHP5, all these problems are inherent with using namespace prefixes. The default namespace problem may not exist with PHP4 (haven't tried it), but I assume the other problem must. Even if PHP4 did it wrong in ext/xml, we shouldn't actively violate PHP4's compatibility. This is not like domxml which was never stable, we shouldn't break compat, even if we are doing the right thing. -Sterling (*) Wrap the first paragraph with 'As Far As I know,' I haven't tested this. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingTue Jan 20 00:31:50 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
-
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.117r2=1.118ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.117 php-src/ext/simplexml/simplexml.c:1.118
--- php-src/ext/simplexml/simplexml.c:1.117 Mon Jan 19 18:44:03 2004
+++ php-src/ext/simplexml/simplexml.c Tue Jan 20 00:31:50 2004
@@ -12,13 +12,13 @@
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
- | Author: Sterling Hughes [EMAIL PROTECTED] |
- | Marcus Boerger [EMAIL PROTECTED] |
- | Rob Richards [EMAIL PROTECTED] |
+ | Authors: Sterling Hughes [EMAIL PROTECTED] |
+ | Marcus Boerger [EMAIL PROTECTED] |
+ | Rob Richards [EMAIL PROTECTED]|
+--+
*/
-/* $Id: simplexml.c,v 1.117 2004/01/19 23:44:03 fmk Exp $ */
+/* $Id: simplexml.c,v 1.118 2004/01/20 05:31:50 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -268,7 +268,7 @@
xmlNodeSetContentLen(node, Z_STRVAL_P(value),
Z_STRLEN_P(value));
break;
default:
- php_error(E_WARNING, It is not yet possible to assign complex
types to attributes);
+ php_error(E_WARNING, It is not possible to assign complex
types to nodes);
break;
}
}
@@ -770,32 +770,70 @@
*/
SXE_METHOD(asXML)
{
- php_sxe_object *sxe;
- xmlChar *strval;
- char *filename;
- int filename_len;
+ php_sxe_object *sxe;
+ xmlNodePtr node;
+ xmlOutputBufferPtr outbuf;
+ xmlChar*strval;
+ int strval_len;
+ char *filename;
+ int filename_len;
+
+ if (ZEND_NUM_ARGS() 1) {
+ RETURN_FALSE;
+ }
if (ZEND_NUM_ARGS() == 1) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, filename,
filename_len) == FAILURE) {
RETURN_FALSE;
}
-
+
sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
-
- xmlSaveFile(filename, (xmlDocPtr) sxe-document-ptr);
-
- RETURN_TRUE;
- }
- if (ZEND_NUM_ARGS() != 0) {
- RETURN_FALSE;
+ GET_NODE(sxe, node);
+
+ if (node) {
+ if (XML_DOCUMENT_NODE == node-parent-type) {
+ xmlSaveFile(filename, (xmlDocPtr) sxe-document-ptr);
+ } else {
+ outbuf = xmlOutputBufferCreateFilename(filename, NULL,
0);
+
+ if (outbuf == NULL) {
+ RETURN_FALSE;
+ }
+
+ xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe-document-ptr, node, 0, 1, NULL);
+ xmlOutputBufferClose(outbuf);
+ RETURN_TRUE;
+ }
+ } else {
+ RETURN_FALSE;
+ }
}
sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
- xmlDocDumpMemory((xmlDocPtr) sxe-document-ptr, strval,
Z_STRLEN_P(return_value));
- Z_STRVAL_P(return_value) = estrndup(strval, Z_STRLEN_P(return_value));
- xmlFree(strval);
+ GET_NODE(sxe, node);
+
+ if (node) {
+ if (XML_DOCUMENT_NODE == node-parent-type) {
+ xmlDocDumpMemory((xmlDocPtr) sxe-document-ptr, strval,
strval_len);
+ } else {
+ /* Should we be passing encoding information instead of NULL?
*/
+ outbuf = xmlAllocOutputBuffer(NULL);
- Z_TYPE_P(return_value) = IS_STRING;
+ if (outbuf == NULL) {
+ RETURN_FALSE;
+ }
+
+ xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe-document-ptr,
node, 0, 1, ((xmlDocPtr) sxe-document-ptr)-encoding);
+ xmlOutputBufferFlush(outbuf);
+ strval = xmlStrndup(outbuf-buffer-content,
outbuf-buffer-use);
+ xmlOutputBufferClose(outbuf);
+ }
+
+ RETVAL_STRINGL(strval, strlen(strval), 1);
+ xmlFree(strval
[PHP-CVS] cvs: php-src /ext/simplexml/tests profile06.phpt profile07.phpt profile10.phpt
sterlingSat Jan 17 11:39:52 2004 EDT
Modified files:
/php-src/ext/simplexml/testsprofile06.phpt profile07.phpt
profile10.phpt
Log:
remove the parser errors here, so they accurately reflect what should happen.
Index: php-src/ext/simplexml/tests/profile06.phpt
diff -u php-src/ext/simplexml/tests/profile06.phpt:1.2
php-src/ext/simplexml/tests/profile06.phpt:1.3
--- php-src/ext/simplexml/tests/profile06.phpt:1.2 Fri Jan 16 17:26:09 2004
+++ php-src/ext/simplexml/tests/profile06.phpt Sat Jan 17 11:39:52 2004
@@ -11,7 +11,8 @@
/root
');
-echo $root-child-attributes('reserved')['attribute'];
+$attr = $root-child-attributes('reserved');
+echo $attr['attribute'];
echo \n---Done---\n;
?
--EXPECT--
Index: php-src/ext/simplexml/tests/profile07.phpt
diff -u php-src/ext/simplexml/tests/profile07.phpt:1.2
php-src/ext/simplexml/tests/profile07.phpt:1.3
--- php-src/ext/simplexml/tests/profile07.phpt:1.2 Fri Jan 16 17:26:09 2004
+++ php-src/ext/simplexml/tests/profile07.phpt Sat Jan 17 11:39:52 2004
@@ -13,8 +13,11 @@
$root-register_ns('myns', 'reserved-ns');
-echo $root-child-attributes('reserved')['attribute'];
-echo $root-child-attributes('myns')['attribute'];
+$rsattr = $root-child-attributes('reserved');
+$myattr = $root-child-attributes('myns');
+
+echo $rsattr['attribute'];
+echo $myattr['attribute'];
echo \n---Done---\n;
?
--EXPECT--
Index: php-src/ext/simplexml/tests/profile10.phpt
diff -u php-src/ext/simplexml/tests/profile10.phpt:1.2
php-src/ext/simplexml/tests/profile10.phpt:1.3
--- php-src/ext/simplexml/tests/profile10.phpt:1.2 Fri Jan 16 17:26:09 2004
+++ php-src/ext/simplexml/tests/profile10.phpt Sat Jan 17 11:39:52 2004
@@ -11,9 +11,12 @@
/root
');
-echo $root-child-attributes('reserved')['attribute'];
+$rsattr = $root-child-attributes('reserved');
+$spattr = $root-child-attributes('special');
+
+echo $rsattr['attribute'];
echo \n;
-echo $root-child-attributes('special')['attribute'];
+echo $spattr['attribute'];
foreach ($root-child['attribute'] as $attr) {
echo $attr\n;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml.h simplexml.c /ext/simplexml/tests profile04.phpt profile05.phpt profile06.phpt profile07.phpt profile10.phpt
sterlingSat Jan 17 16:22:27 2004 EDT
Modified files:
/php-src/ext/simplexml php_simplexml.h simplexml.c
/php-src/ext/simplexml/testsprofile04.phpt profile05.phpt
profile06.phpt profile07.phpt
profile10.phpt
Log:
namespace accesses are now soley URI based as opposed to prefix based.
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.13
php-src/ext/simplexml/php_simplexml.h:1.14
--- php-src/ext/simplexml/php_simplexml.h:1.13 Sat Jan 17 14:41:31 2004
+++ php-src/ext/simplexml/php_simplexml.h Sat Jan 17 16:22:26 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_simplexml.h,v 1.13 2004/01/17 19:41:31 helly Exp $ */
+/* $Id: php_simplexml.h,v 1.14 2004/01/17 21:22:26 sterling Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -53,16 +53,10 @@
PHP_MINFO_FUNCTION(simplexml);
typedef struct {
- xmlHashTablePtr nsmap;
- int refcount;
-} simplexml_nsmap;
-
-typedef struct {
zend_object zo;
php_libxml_node_ptr *node;
php_libxml_ref_obj *document;
HashTable *properties;
- simplexml_nsmap *nsmapptr;
xmlXPathContextPtr xpath;
struct {
php_libxml_node_ptr *node;
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.110 php-src/ext/simplexml/simplexml.c:1.111
--- php-src/ext/simplexml/simplexml.c:1.110 Sat Jan 17 14:41:31 2004
+++ php-src/ext/simplexml/simplexml.c Sat Jan 17 16:22:26 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.110 2004/01/17 19:41:31 helly Exp $ */
+/* $Id: simplexml.c,v 1.111 2004/01/17 21:22:26 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -66,8 +66,6 @@
subnode = php_sxe_object_new(sxe-zo.ce TSRMLS_CC);
subnode-document = sxe-document;
subnode-document-refcount++;
- subnode-nsmapptr = sxe-nsmapptr;
- subnode-nsmapptr-refcount++;
subnode-iter.type = itertype;
if (name) {
subnode-iter.name = xmlStrdup(name);
@@ -126,28 +124,12 @@
static inline int
match_ns(php_sxe_object *sxe, xmlNodePtr node, xmlChar *name)
{
- xmlChar *prefix = NULL;
-
- if (name == NULL (node-ns == NULL || node-ns-prefix == NULL)) {
+ if (name == NULL (node-ns == NULL || node-ns-href == NULL)) {
return 1;
}
-
- if (node-ns) {
- if (sxe-nsmapptr) {
- prefix = xmlHashLookup(sxe-nsmapptr-nsmap, node-ns-href);
- }
-
- if (prefix == NULL) {
- prefix = (xmlChar*)node-ns-prefix;
- }
-
- if (prefix == NULL) {
- return 0;
- }
-
- if (!xmlStrcmp(prefix, name)) {
- return 1;
- }
+
+ if (!xmlStrcmp(node-ns-href, name)) {
+ return 1;
}
return 0;
@@ -597,8 +579,6 @@
subnode = php_sxe_object_new(sxe_ref-zo.ce TSRMLS_CC);
subnode-document = sxe_ref-document;
subnode-document-refcount++;
- subnode-nsmapptr = sxe_ref-nsmapptr;
- subnode-nsmapptr-refcount++;
php_libxml_increment_node_ptr((php_libxml_node_object *)subnode, node,
NULL TSRMLS_CC);
(*value)-type = IS_OBJECT;
@@ -712,16 +692,6 @@
}
/* }}} */
-/* {{{ simplexml_ce_xpath_register_ns()
- */
-static void
-simplexml_ce_xpath_register_ns(char *prefix, xmlXPathContext *xpath, char *href)
-{
- xmlXPathRegisterNs(xpath, prefix, href);
-}
-/* }}} */
-
-
/* {{{ xpath()
*/
SXE_METHOD(xpath)
@@ -752,7 +722,6 @@
sxe-xpath-node = sxe-node-node;
ns = xmlGetNsList((xmlDocPtr) sxe-document-ptr, (xmlNodePtr)
sxe-node-node);
-
if (ns != NULL) {
while (ns[nsnbr] != NULL) {
nsnbr++;
@@ -762,14 +731,7 @@
sxe-xpath-namespaces = ns;
sxe-xpath-nsNr = nsnbr;
- /* Register namespaces added in simplexml_cs_register_ns() */
- xmlHashScan((xmlHashTablePtr) sxe-nsmapptr-nsmap, (xmlHashScanner)
simplexml_ce_xpath_register_ns, sxe-xpath);
-
retval = xmlXPathEval(query, sxe-xpath);
-
- /* Cleanup registered namespaces added in simplexml_cs_register_ns() */
- xmlXPathRegisteredNsCleanup(sxe-xpath);
-
if (ns != NULL) {
xmlFree(ns);
sxe-xpath-namespaces = NULL;
@@ -811,26 +773,6 @@
}
/* }}} */
-/* {{{ simplexml_ce_register_ns()
- */
-SXE_METHOD(register_ns)
-{
- php_sxe_object *sxe;
- char *nsname;
- char *nsvalue;
- int nsname_len;
-
[PHP-CVS] cvs: php-src /ext/simplexml/examples security.php xpath.php
sterlingSat Jan 17 16:44:23 2004 EDT
Modified files:
/php-src/ext/simplexml/examples security.php xpath.php
Log:
update the examples
Index: php-src/ext/simplexml/examples/security.php
diff -u php-src/ext/simplexml/examples/security.php:1.4
php-src/ext/simplexml/examples/security.php:1.5
--- php-src/ext/simplexml/examples/security.php:1.4 Sun Oct 26 13:56:03 2003
+++ php-src/ext/simplexml/examples/security.php Sat Jan 17 16:44:22 2004
@@ -2,5 +2,5 @@
$s = simplexml_load_file('security.xml');
echo $s-id;
$s-id = 20;
-$s-to_xml_file('security.new.xml');
+$s-asXML('security.new.xml');
?
Index: php-src/ext/simplexml/examples/xpath.php
diff -u php-src/ext/simplexml/examples/xpath.php:1.1
php-src/ext/simplexml/examples/xpath.php:1.2
--- php-src/ext/simplexml/examples/xpath.php:1.1Sun Oct 26 14:15:52 2003
+++ php-src/ext/simplexml/examples/xpath.phpSat Jan 17 16:44:22 2004
@@ -1,7 +1,7 @@
?php
$books = simplexml_load_file('book.xml');
-$xpath_result = $books-xsearch(/books/book/title);
+$xpath_result = $books-xpath(/books/book/title);
foreach($xpath_result as $entry ) {
print $entry \n;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests profile08.phpt profile11.phpt
sterlingSat Jan 17 16:47:44 2004 EDT
Modified files:
/php-src/ext/simplexml/testsprofile08.phpt profile11.phpt
Log:
update the tests proper-like
Index: php-src/ext/simplexml/tests/profile08.phpt
diff -u php-src/ext/simplexml/tests/profile08.phpt:1.1
php-src/ext/simplexml/tests/profile08.phpt:1.2
--- php-src/ext/simplexml/tests/profile08.phpt:1.1 Fri Jan 16 15:50:29 2004
+++ php-src/ext/simplexml/tests/profile08.phpt Sat Jan 17 16:47:43 2004
@@ -15,5 +15,4 @@
echo \n---Done---\n;
?
--EXPECT--
-
---Done---
Index: php-src/ext/simplexml/tests/profile11.phpt
diff -u php-src/ext/simplexml/tests/profile11.phpt:1.2
php-src/ext/simplexml/tests/profile11.phpt:1.3
--- php-src/ext/simplexml/tests/profile11.phpt:1.2 Fri Jan 16 17:26:09 2004
+++ php-src/ext/simplexml/tests/profile11.phpt Sat Jan 17 16:47:43 2004
@@ -12,9 +12,9 @@
/root
');
-echo $root-children('reserved')-child;
+echo $root-children('reserved-ns')-child;
echo \n;
-echo $root-children('special')-child;
+echo $root-children('special-ns')-child;
foreach ($root-child as $child) {
echo $child\n;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/simplexml
On Sat, 17 Jan 2004, Sterling Hughes wrote: namespace accesses are now soley URI based as opposed to prefix based. Sterling -- This patch breaks xpath() because you can no longer access nodes in a default namespace. You *need* to register a prefix for them or XPath thinks you're searching for nodes in the global namespace, not the default namespace. Maybe we change the method to xpath_register_ns(), so it's clear this only works for xpath()? How about we provide an array of aliases to the xpath() function? This will avoid nasty refcounting as well. -Sterling -- Reductionists like to take things apart. The rest of us are just trying to get it together. - Larry Wall, Programming Perl, 3rd Edition -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests profile01.phpt profile02.phpt profile03.phpt profile04.phpt profile05.phpt profile06.phpt profile07.phpt profile08.phpt profile09.phpt profile10.phpt profile11.phpt
sterlingFri Jan 16 15:50:31 2004 EDT
Added files:
/php-src/ext/simplexml/testsprofile01.phpt profile02.phpt
profile03.phpt profile04.phpt
profile05.phpt profile06.phpt
profile07.phpt profile08.phpt
profile09.phpt profile10.phpt
profile11.phpt
Log:
Add a profile of simplexml's expected behaviour in the form of tests.
This will be expanded as issues arise and will be a formal definition
(in code) of simplexml's behaviour.
Index: php-src/ext/simplexml/tests/profile01.phpt
+++ php-src/ext/simplexml/tests/profile01.phpt
--TEST--
SimpleXML [profile]: Accessing a simple node
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
$root = simplexml_load_string('?xml version=1.0?
root
childHello/child
/root
');
echo $root-child;
echo \n---Done---\n;
?
--EXPECT--
Hello
---Done---
Index: php-src/ext/simplexml/tests/profile02.phpt
+++ php-src/ext/simplexml/tests/profile02.phpt
--TEST--
SimpleXML [profile]: Accessing an array of subnodes
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
$root = simplexml_load_string('?xml version=1.0?
root
childHello/child
childWorld/child
/root
');
foreach ($root-child as $child) {
echo $child ;
}
echo \n---Done---\n;
?
--EXPECT--
Hello World
---Done---
Index: php-src/ext/simplexml/tests/profile03.phpt
+++ php-src/ext/simplexml/tests/profile03.phpt
--TEST--
SimpleXML [profile]: Accessing an attribute
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
$root = simplexml_load_string('?xml version=1.0?
root
child attribute=Sample /
/root
');
echo $root-child['attribute'];
echo \n---Done---\n;
?
--EXPECT--
Sample
---Done---
Index: php-src/ext/simplexml/tests/profile04.phpt
+++ php-src/ext/simplexml/tests/profile04.phpt
--TEST--
SimpleXML [profile]: Accessing a namespaced element
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
$root = simplexml_load_string('?xml version=1.0?
root xmlns:reserved=reserved-ns
reserved:childHello/reserved:child
/root
');
echo $root-reserved-child;
echo \n---Done---\n;
?
--EXPECT--
Hello
---Done---
Index: php-src/ext/simplexml/tests/profile05.phpt
+++ php-src/ext/simplexml/tests/profile05.phpt
--TEST--
SimpleXML [profile]: Accessing an aliased namespaced element
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
error_reporting(E_ALL ~E_NOTICE);
$root = simplexml_load_string('?xml version=1.0?
root xmlns:reserved=reserved-ns
reserved:childHello/reserved:child
/root
');
$root-register_ns('myns', 'reserved-ns');
echo $root-myns-child;
echo $root-reserved-child;
echo \n---Done---\n;
?
--EXPECT--
Hello
---Done---
Index: php-src/ext/simplexml/tests/profile06.phpt
+++ php-src/ext/simplexml/tests/profile06.phpt
--TEST--
SimpleXML [profile]: Accessing a namespaced attribute
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
error_reporting(E_ALL ~E_NOTICE);
$root = simplexml_load_string('?xml version=1.0?
root xmlns:reserved=reserved-ns
child reserved:attribute=Sample /
/root
');
echo $root-child['reserved:attribute'];
echo \n---Done---\n;
?
--EXPECT--
Sample
---Done---
Index: php-src/ext/simplexml/tests/profile07.phpt
+++ php-src/ext/simplexml/tests/profile07.phpt
--TEST--
SimpleXML [profile]: Accessing an aliased namespaced attribute
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
error_reporting(E_ALL ~E_NOTICE);
$root = simplexml_load_string('?xml version=1.0?
root xmlns:reserved=reserved-ns
child reserved:attribute=Sample /
/root
');
$root-register_ns('myns', 'reserved-ns');
echo $root-child['reserved:attribute'];
echo $root-child['myns:attribute'];
echo \n---Done---\n;
?
--EXPECT--
Sample
---Done---
Index: php-src/ext/simplexml/tests/profile08.phpt
+++ php-src/ext/simplexml/tests/profile08.phpt
--TEST--
SimpleXML [profile]: Accessing a namespaced attribute without a namespace
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
error_reporting(E_ALL ~E_NOTICE);
$root = simplexml_load_string('?xml version=1.0?
root xmlns:reserved=reserved-ns
child reserved:attribute=Sample /
/root
');
echo $root-child['attribute'];
echo \n---Done---\n;
?
--EXPECT--
---Done---
Index: php-src/ext/simplexml/tests/profile09.phpt
+++ php-src/ext/simplexml/tests/profile09.phpt
--TEST--
SimpleXML [profile]: Accessing a namespaced element without a namespace
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php
error_reporting(E_ALL ~E_NOTICE);
$root = simplexml_load_string('?xml version=1.0?
root xmlns:reserved=reserved-ns
reserved:childHello/reserved:child
/root
');
echo $root-child;
echo \n---Done---\n;
?
--EXPECT--
---Done---
[PHP-CVS] cvs: CVSROOT / avail
sterlingFri Jan 16 17:11:52 2004 EDT Modified files: /CVSROOTavail Log: give ilia presentations karma Index: CVSROOT/avail diff -u CVSROOT/avail:1.812 CVSROOT/avail:1.813 --- CVSROOT/avail:1.812 Sat Jan 10 16:53:24 2004 +++ CVSROOT/avail Fri Jan 16 17:11:48 2004 @@ -36,7 +36,7 @@ # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -avail|sterling,jon,graeme,derick,imajes,wez,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra|pres,pres2,presentations +avail|sterling,jon,graeme,derick,imajes,wez,ilia,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra|pres,pres2,presentations # The PHP Quality Assurance Team maintains their own website. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sterlingFri Jan 16 17:12:39 2004 EDT Modified files: /CVSROOTavail Log: ilia*a* Index: CVSROOT/avail diff -u CVSROOT/avail:1.813 CVSROOT/avail:1.814 --- CVSROOT/avail:1.813 Fri Jan 16 17:11:48 2004 +++ CVSROOT/avail Fri Jan 16 17:12:35 2004 @@ -36,7 +36,7 @@ # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -avail|sterling,jon,graeme,derick,imajes,wez,ilia,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra|pres,pres2,presentations +avail|sterling,jon,graeme,derick,imajes,wez,iliaa,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra|pres,pres2,presentations # The PHP Quality Assurance Team maintains their own website. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests profile04.phpt profile05.phpt profile06.phpt profile07.phpt profile10.phpt profile11.phpt
sterlingFri Jan 16 17:26:10 2004 EDT
Modified files:
/php-src/ext/simplexml/testsprofile04.phpt profile05.phpt
profile06.phpt profile07.phpt
profile10.phpt profile11.phpt
Log:
update the profile of how namespaces should work after discussions with
shane and rob richards. there were a lot of race conditions with regards
to the way namespaces have been handled in XML documents so far, this new
method removes the race conditions, and gives me a real reason to add the
children() and attributes() methods.
Index: php-src/ext/simplexml/tests/profile04.phpt
diff -u php-src/ext/simplexml/tests/profile04.phpt:1.1
php-src/ext/simplexml/tests/profile04.phpt:1.2
--- php-src/ext/simplexml/tests/profile04.phpt:1.1 Fri Jan 16 15:50:29 2004
+++ php-src/ext/simplexml/tests/profile04.phpt Fri Jan 16 17:26:09 2004
@@ -10,7 +10,7 @@
/root
');
-echo $root-reserved-child;
+echo $root-children('reserved')-child;
echo \n---Done---\n;
?
--EXPECT--
Index: php-src/ext/simplexml/tests/profile05.phpt
diff -u php-src/ext/simplexml/tests/profile05.phpt:1.1
php-src/ext/simplexml/tests/profile05.phpt:1.2
--- php-src/ext/simplexml/tests/profile05.phpt:1.1 Fri Jan 16 15:50:29 2004
+++ php-src/ext/simplexml/tests/profile05.phpt Fri Jan 16 17:26:09 2004
@@ -13,8 +13,8 @@
$root-register_ns('myns', 'reserved-ns');
-echo $root-myns-child;
-echo $root-reserved-child;
+echo $root-children('myns')-child;
+echo $root-children('reserved')-child;
echo \n---Done---\n;
?
--EXPECT--
Index: php-src/ext/simplexml/tests/profile06.phpt
diff -u php-src/ext/simplexml/tests/profile06.phpt:1.1
php-src/ext/simplexml/tests/profile06.phpt:1.2
--- php-src/ext/simplexml/tests/profile06.phpt:1.1 Fri Jan 16 15:50:29 2004
+++ php-src/ext/simplexml/tests/profile06.phpt Fri Jan 16 17:26:09 2004
@@ -11,7 +11,7 @@
/root
');
-echo $root-child['reserved:attribute'];
+echo $root-child-attributes('reserved')['attribute'];
echo \n---Done---\n;
?
--EXPECT--
Index: php-src/ext/simplexml/tests/profile07.phpt
diff -u php-src/ext/simplexml/tests/profile07.phpt:1.1
php-src/ext/simplexml/tests/profile07.phpt:1.2
--- php-src/ext/simplexml/tests/profile07.phpt:1.1 Fri Jan 16 15:50:29 2004
+++ php-src/ext/simplexml/tests/profile07.phpt Fri Jan 16 17:26:09 2004
@@ -13,8 +13,8 @@
$root-register_ns('myns', 'reserved-ns');
-echo $root-child['reserved:attribute'];
-echo $root-child['myns:attribute'];
+echo $root-child-attributes('reserved')['attribute'];
+echo $root-child-attributes('myns')['attribute'];
echo \n---Done---\n;
?
--EXPECT--
Index: php-src/ext/simplexml/tests/profile10.phpt
diff -u php-src/ext/simplexml/tests/profile10.phpt:1.1
php-src/ext/simplexml/tests/profile10.phpt:1.2
--- php-src/ext/simplexml/tests/profile10.phpt:1.1 Fri Jan 16 15:50:29 2004
+++ php-src/ext/simplexml/tests/profile10.phpt Fri Jan 16 17:26:09 2004
@@ -11,9 +11,9 @@
/root
');
-echo $root-child['reserved:attribute'];
+echo $root-child-attributes('reserved')['attribute'];
echo \n;
-echo $root-child['special:attribute'];
+echo $root-child-attributes('special')['attribute'];
foreach ($root-child['attribute'] as $attr) {
echo $attr\n;
}
Index: php-src/ext/simplexml/tests/profile11.phpt
diff -u php-src/ext/simplexml/tests/profile11.phpt:1.1
php-src/ext/simplexml/tests/profile11.phpt:1.2
--- php-src/ext/simplexml/tests/profile11.phpt:1.1 Fri Jan 16 15:50:29 2004
+++ php-src/ext/simplexml/tests/profile11.phpt Fri Jan 16 17:26:09 2004
@@ -12,9 +12,9 @@
/root
');
-echo $root-reserved-child;
+echo $root-children('reserved')-child;
echo \n;
-echo $root-special-child;
+echo $root-children('special')-child;
foreach ($root-child as $child) {
echo $child\n;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingThu Jan 8 17:40:09 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix dumping, when dumping a text element, for example:
?php
$doc = simplexml_load_string('?xml version=1.0?
namelist
name
firsthelly/first
/name
name
firststerling/first
/name
/namelist');
var_dump($doc-name[0]-first);
Used to not display the node's content, now it does.
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.100 php-src/ext/simplexml/simplexml.c:1.101
--- php-src/ext/simplexml/simplexml.c:1.100 Thu Jan 8 15:27:35 2004
+++ php-src/ext/simplexml/simplexml.c Thu Jan 8 17:40:08 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.100 2004/01/08 20:27:35 helly Exp $ */
+/* $Id: simplexml.c,v 1.101 2004/01/08 22:40:08 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -592,8 +592,17 @@
node = node-children;
while (node) {
- SKIP_TEXT(node);
-
+ if (node-children != NULL || node-prev != NULL || node-next
!= NULL) {
+ SKIP_TEXT(node);
+ } else {
+ if (node-type == XML_TEXT_NODE) {
+ MAKE_STD_ZVAL(value);
+ ZVAL_STRING(value,
xmlNodeListGetString(node-doc, node, 1), 1);
+ zend_hash_next_index_insert(rv, value,
sizeof(zval *), NULL);
+ goto next_iter;
+ }
+ }
+
name = (char *) node-name;
if (!name) {
goto next_iter;
@@ -1655,7 +1664,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.100 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.101 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml.h simplexml.c
sterlingFri Jan 9 01:12:32 2004 EDT
Modified files:
/php-src/ext/simplexml php_simplexml.h simplexml.c
Log:
Remove these initializers as they are unused.
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.11
php-src/ext/simplexml/php_simplexml.h:1.12
--- php-src/ext/simplexml/php_simplexml.h:1.11 Thu Jan 8 12:32:46 2004
+++ php-src/ext/simplexml/php_simplexml.h Fri Jan 9 01:12:29 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_simplexml.h,v 1.11 2004/01/08 17:32:46 sniper Exp $ */
+/* $Id: php_simplexml.h,v 1.12 2004/01/09 06:12:29 sterling Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -47,9 +47,9 @@
#include libxml/xmlschemas.h
PHP_MINIT_FUNCTION(simplexml);
-PHP_MSHUTDOWN_FUNCTION(simplexml);
+#if HAVE_SPL !defined(COMPILE_DL_SPL)
PHP_RINIT_FUNCTION(simplexml);
-PHP_RSHUTDOWN_FUNCTION(simplexml);
+#endif
PHP_MINFO_FUNCTION(simplexml);
typedef struct {
@@ -82,7 +82,6 @@
#endif
-
/*
* Local variables:
* tab-width: 4
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.101 php-src/ext/simplexml/simplexml.c:1.102
--- php-src/ext/simplexml/simplexml.c:1.101 Thu Jan 8 17:40:08 2004
+++ php-src/ext/simplexml/simplexml.c Fri Jan 9 01:12:29 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.101 2004/01/08 22:40:08 sterling Exp $ */
+/* $Id: simplexml.c,v 1.102 2004/01/09 06:12:29 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1578,9 +1578,13 @@
simplexml,
simplexml_functions,
PHP_MINIT(simplexml),
- PHP_MSHUTDOWN(simplexml),
- PHP_RINIT(simplexml),
- PHP_RSHUTDOWN(simplexml),
+ NULL,
+#if HAVE_SPL !defined(COMPILE_DL_SPL)
+ PHP_RINIT(simplexml),
+#else
+ NULL,
+#endif
+ NULL,
PHP_MINFO(simplexml),
0.1,
STANDARD_MODULE_PROPERTIES
@@ -1631,32 +1635,16 @@
}
/* }}} */
-/* {{{ PHP_MSHUTDOWN_FUNCTION(simplexml)
- */
-PHP_MSHUTDOWN_FUNCTION(simplexml)
-{
- return SUCCESS;
-}
-/* }}} */
-
+#if HAVE_SPL !defined(COMPILE_DL_SPL)
/* {{{ PHP_RINIT_FUNCTION(simplexml)
*/
PHP_RINIT_FUNCTION(simplexml)
{
-#if HAVE_SPL !defined(COMPILE_DL_SPL)
zend_class_implements(sxe_class_entry TSRMLS_CC, 1, spl_ce_RecursiveIterator);
-#endif
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_RSHUTDOWN_FUNCTION(simplexml)
- */
-PHP_RSHUTDOWN_FUNCTION(simplexml)
-{
return SUCCESS;
}
/* }}} */
+#endif
/* {{{ PHP_MINFO_FUNCTION(simplexml)
*/
@@ -1664,7 +1652,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.101 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.102 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingMon Nov 3 08:36:24 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Stop a crash in xpath
- Remove the ability to access attributes via the - operator, attributes
are accessed via the array indicators
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.78 php-src/ext/simplexml/simplexml.c:1.79
--- php-src/ext/simplexml/simplexml.c:1.78 Wed Oct 29 13:04:24 2003
+++ php-src/ext/simplexml/simplexml.c Mon Nov 3 08:36:23 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.78 2003/10/29 18:04:24 moriyoshi Exp $ */
+/* $Id: simplexml.c,v 1.79 2003/11/03 13:36:23 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -227,7 +227,7 @@
static zval *
sxe_property_read(zval *object, zval *member, zend_bool silent TSRMLS_DC)
{
- return sxe_prop_dim_read(object, member, 1, 1, silent TSRMLS_CC);
+ return sxe_prop_dim_read(object, member, 1, 0, silent TSRMLS_CC);
}
/* }}} */
@@ -634,6 +634,7 @@
char *query;
intquery_len;
inti;
+ xmlXPathObjectPtr retval;
xmlNodeSetPtr result;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, query, query_len)
== FAILURE) {
@@ -650,7 +651,13 @@
sxe-xpath-node = sxe-node-node;
- result = xmlXPathEval(query, sxe-xpath)-nodesetval;
+ retval = xmlXPathEval(query, sxe-xpath);
+ if (!retval) {
+ RETURN_FALSE;
+ }
+
+
+ result = retval-nodesetval;
if (!result) {
RETURN_FALSE;
}
@@ -1393,7 +1400,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.78 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.79 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingMon Nov 3 08:50:44 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
remove attributes from this check
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.79 php-src/ext/simplexml/simplexml.c:1.80
--- php-src/ext/simplexml/simplexml.c:1.79 Mon Nov 3 08:36:23 2003
+++ php-src/ext/simplexml/simplexml.c Mon Nov 3 08:50:43 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.79 2003/11/03 13:36:23 sterling Exp $ */
+/* $Id: simplexml.c,v 1.80 2003/11/03 13:50:43 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -368,15 +368,6 @@
GET_NODE(sxe, node);
if (node) {
- attr = node-properties;
- while (attr) {
- if (!xmlStrcmp(attr-name, name)) {
- return 1;
- }
-
- attr = attr-next;
- }
-
node = node-children;
while (node) {
SKIP_TEXT(node);
@@ -1400,7 +1391,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.79 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.80 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingMon Nov 3 08:55:20 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
make this macro safe
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.80 php-src/ext/simplexml/simplexml.c:1.81
--- php-src/ext/simplexml/simplexml.c:1.80 Mon Nov 3 08:50:43 2003
+++ php-src/ext/simplexml/simplexml.c Mon Nov 3 08:55:19 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.80 2003/11/03 13:50:43 sterling Exp $ */
+/* $Id: simplexml.c,v 1.81 2003/11/03 13:55:19 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -81,8 +81,8 @@
}
#define GET_NODE(__s, __n) { \
- if (__s-node __s-node-node) { \
- __n = __s-node-node; \
+ if ((__s)-node (__s)-node-node) { \
+ __n = (__s)-node-node; \
} else { \
__n = NULL; \
php_error(E_WARNING, Node no longer exists); \
@@ -1391,7 +1391,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.80 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.81 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard array.c
Am Mon, 2003-08-04 um 04.38 schrieb Zeev Suraski:
zeev Mon Aug 4 04:38:24 2003 EDT
Modified files:
/php-src/ext/standard array.c
Log:
Fix bug #24652 - Sterling, do you begin to think that maybe it wasn't such
a good idea?
Nope. Needs only to be fixed once, and the performance gain is
signifigant enough. :)
-Sterling
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.236 php-src/ext/standard/array.c:1.237
--- php-src/ext/standard/array.c:1.236Thu Jul 24 23:03:26 2003
+++ php-src/ext/standard/array.c Mon Aug 4 04:38:24 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.236 2003/07/25 03:03:26 iliaa Exp $ */
+/* $Id: array.c,v 1.237 2003/08/04 08:38:24 zeev Exp $ */
#include php.h
#include php_ini.h
@@ -2545,7 +2545,7 @@
if (Z_TYPE_PP(entry) == IS_LONG) {
zend_hash_index_update(Z_ARRVAL_P(return_value),
Z_LVAL_PP(entry), data, sizeof(data), NULL);
} else if (Z_TYPE_PP(entry) == IS_STRING) {
- zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_PP(entry),
Z_STRLEN_PP(entry) + 1, data, sizeof(data), NULL);
+ zend_symtable_update(Z_ARRVAL_P(return_value),
Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, data, sizeof(data), NULL);
} else {
zval_ptr_dtor(data); /* will free also zval structure */
php_error_docref(NULL TSRMLS_CC, E_WARNING, Can only flip
STRING and INTEGER values!);
--
We all agree on the necessity of compromise. We just can't agree on when
it's necessary to compromise.
- Larry Wall
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/snmp php_snmp.h snmp.c
+ + /* Prevent read_mib() from printing any errors. */ + snmp_disable_stderrlog(); + How does one get the error that occurred then? -Sterling -- Premature optimization is the root of all evil - Donald E. Knuth -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/dbase dbase.c
Why create such names? Where is the advantage? If you are going to change it, please just make them aliases, so you can use either. -Sterling On Wed, 2003-07-16 at 07:08, Zak Greant wrote: zak Wed Jul 16 07:08:03 2003 EDT Modified files: /php-src/ext/dbasedbase.c Log: Created shorter/sensible key names for dbase_get_header_info * 'decimal places' becomes 'precision' * 'printf format' becomes 'format' * 'record offset' becomes 'offset' BTW No docs have been committed for this function yet, nor is it part of any release. This change should affect no users. Index: php-src/ext/dbase/dbase.c diff -u php-src/ext/dbase/dbase.c:1.65 php-src/ext/dbase/dbase.c:1.66 --- php-src/ext/dbase/dbase.c:1.65Tue Jul 15 14:19:51 2003 +++ php-src/ext/dbase/dbase.c Wed Jul 16 07:08:03 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dbase.c,v 1.65 2003/07/15 18:19:51 zak Exp $ */ +/* $Id: dbase.c,v 1.66 2003/07/16 11:08:03 zak Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -793,13 +793,13 @@ add_assoc_long(row, length, cur_f-db_flen); /* number of decimals in field */ - add_assoc_long(row, decimal places, cur_f-db_fdc); + add_assoc_long(row, precision, cur_f-db_fdc); /* format for printing %s etc */ - add_assoc_string(row, printf format, cur_f-db_format, 1); + add_assoc_string(row, format, cur_f-db_format, 1); /* offset within record */ - add_assoc_long(row, record offset, cur_f-db_foffset); + add_assoc_long(row, offset, cur_f-db_foffset); } } /* }}} */ -- King's Law of Clues : Common sense is inversely proportional to the academic intelligence of the person concerned. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/dbase dbase.c
Right, and if they change, then old code doesn't work. Function names are just elements within an associative array after all ;-) -Sterling On Wed, 2003-07-16 at 09:54, Derick Rethans wrote: On Wed, 16 Jul 2003, Sterling Hughes wrote: Why create such names? Where is the advantage? If you are going to change it, please just make them aliases, so you can use either. uhm? Those were just names for the keys of the elements in an associative array... Derick -- UNIX was not designed to stop you from doing stupid things, because that would also stop you from doing clever things. - Doug Gwyn -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/dbase dbase.c
woops :) -Sterling On Wed, 2003-07-16 at 10:06, Derick Rethans wrote: On Wed, 16 Jul 2003, Sterling Hughes wrote: Right, and if they change, then old code doesn't work. There is NO old code... this was added yesterday. Derick -- There is no safe investment. To love at all is to be vulnerable. ... The only place outside Heaven where you can be perfectly safe from all the dangers and pertubations of love is Hell. - CS Lewis, The Four Loves -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml expat_compat.h
sterlingTue Jul 8 23:14:41 2003 EDT Modified files: /php-src/ext/xmlexpat_compat.h Log: boom bam bing Index: php-src/ext/xml/expat_compat.h diff -u php-src/ext/xml/expat_compat.h:1.10 php-src/ext/xml/expat_compat.h:1.11 --- php-src/ext/xml/expat_compat.h:1.10 Sun Jun 15 16:40:45 2003 +++ php-src/ext/xml/expat_compat.h Tue Jul 8 23:14:41 2003 @@ -16,13 +16,15 @@ +--+ */ -/* $Id: expat_compat.h,v 1.10 2003/06/15 20:40:45 moriyoshi Exp $ */ +/* $Id: expat_compat.h,v 1.11 2003/07/09 03:14:41 sterling Exp $ */ #ifndef PHP_EXPAT_COMPAT_H #define PHP_EXPAT_COMPAT_H #if !defined(HAVE_LIBEXPAT) defined(HAVE_LIBXML) #define LIBXML_EXPAT_COMPAT 1 + +#include php_compat.h #include libxml/hash.h #include libxml/parser.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_compat.h
sterlingFri Jul 4 14:19:02 2003 EDT Modified files: /php-src/main php_compat.h Log: avoid external conflicts in apache Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.14 php-src/main/php_compat.h:1.15 --- php-src/main/php_compat.h:1.14 Tue Jun 10 16:03:41 2003 +++ php-src/main/php_compat.h Fri Jul 4 14:19:02 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_compat.h,v 1.14 2003/06/10 20:03:41 imajes Exp $ */ +/* $Id: php_compat.h,v 1.15 2003/07/04 18:19:02 sterling Exp $ */ #ifndef PHP_COMPAT_H #define PHP_COMPAT_H @@ -47,7 +47,7 @@ #define hashTableIterInit php_hashTableIterInit #define hashTableIterNext php_hashTableIterNext -#ifdef HAVE_LIBEXPAT_BUNDLED +#if defined(HAVE_LIBXML) defined(HAVE_XML) #define XML_DefaultCurrent php_XML_DefaultCurrent #define XML_ErrorString php_XML_ErrorString #define XML_ExpatVersion php_XML_ExpatVersion -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingFri Jul 4 17:58:09 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix memory cverrun when accessing an empty xml element.
guess how many lines it took me to write a basic WSDL parser + API? 20 using
curl + simplexml
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.47 php-src/ext/simplexml/simplexml.c:1.48
--- php-src/ext/simplexml/simplexml.c:1.47 Mon Jun 30 20:49:25 2003
+++ php-src/ext/simplexml/simplexml.c Fri Jul 4 17:58:09 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.47 2003/07/01 00:49:25 helly Exp $ */
+/* $Id: simplexml.c,v 1.48 2003/07/04 21:58:09 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -177,7 +177,7 @@
if (counter == 1) {
SEPARATE_ZVAL(value);
zval_dtor(return_value);
- FREE_ZVAL(return_value);
+ FREE_ZVAL(return_value);
return_value = value;
}
@@ -715,7 +715,7 @@
/* {{{ cast_object()
*/
-static inline void
+static void
cast_object(zval *object, int type, char *contents TSRMLS_DC)
{
if (contents) {
@@ -727,7 +727,8 @@
switch (type) {
case IS_STRING:
- return;
+ convert_to_string(object);
+ break;
case IS_BOOL:
convert_to_boolean(object);
break;
@@ -762,9 +763,8 @@
}
if (sxe-node) {
- contents = xmlNodeListGetString((xmlDocPtr) sxe-document-ptr,
sxe-node-children, 1);
- if (!xmlIsBlankNode(sxe-node-children) contents) {
- cast_object(writeobj, type, NULL TSRMLS_CC);
+ if (sxe-node-children) {
+ contents = xmlNodeListGetString((xmlDocPtr)
sxe-document-ptr, sxe-node-children, 1);
}
}
@@ -1059,7 +1059,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.47 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.48 $);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingFri Jul 4 18:21:23 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
real fix
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.48 php-src/ext/simplexml/simplexml.c:1.49
--- php-src/ext/simplexml/simplexml.c:1.48 Fri Jul 4 17:58:09 2003
+++ php-src/ext/simplexml/simplexml.c Fri Jul 4 18:21:23 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.48 2003/07/04 21:58:09 sterling Exp $ */
+/* $Id: simplexml.c,v 1.49 2003/07/04 22:21:23 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -719,10 +719,7 @@
cast_object(zval *object, int type, char *contents TSRMLS_DC)
{
if (contents) {
- int len = strlen(contents);
- ZVAL_STRINGL(object, contents, len, 1);
- } else {
- ZVAL_NULL(object);
+ ZVAL_STRINGL(object, contents, strlen(contents), 1);
}
switch (type) {
@@ -751,7 +748,6 @@
char *contents = NULL;
sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
-
if (should_free) {
zval_dtor(writeobj);
}
@@ -1059,7 +1055,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.48 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.49 $);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingFri Jul 4 20:33:13 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
not a temp var unless its a singular var
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.49 php-src/ext/simplexml/simplexml.c:1.50
--- php-src/ext/simplexml/simplexml.c:1.49 Fri Jul 4 18:21:23 2003
+++ php-src/ext/simplexml/simplexml.c Fri Jul 4 20:33:13 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.49 2003/07/04 22:21:23 sterling Exp $ */
+/* $Id: simplexml.c,v 1.50 2003/07/05 00:33:13 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -179,11 +179,10 @@
zval_dtor(return_value);
FREE_ZVAL(return_value);
return_value = value;
+ } else {
+ PZVAL_UNLOCK(return_value);
}
- /* create temporary variable */
- PZVAL_UNLOCK(return_value);
-
return return_value;
}
/* }}} */
@@ -1055,7 +1054,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.49 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.50 $);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /tests/lang bug22510.phpt
This is the wrong adjustment. The bug Zeev fixed also existed here (not
related to objects). You should adjust the EXPECT portion to the
current output.
-Sterling
On Wed, 2003-07-02 at 11:38, Moriyoshi Koizumi wrote:
moriyoshi Wed Jul 2 11:38:51 2003 EDT
Modified files:
/php-src/tests/lang bug22510.phpt
Log:
Adjust test.
# This was also fixed by the Zeev's patch for bug #22367.
Index: php-src/tests/lang/bug22510.phpt
diff -u php-src/tests/lang/bug22510.phpt:1.1 php-src/tests/lang/bug22510.phpt:1.2
--- php-src/tests/lang/bug22510.phpt:1.1 Tue Mar 4 14:52:22 2003
+++ php-src/tests/lang/bug22510.phpt Wed Jul 2 11:38:51 2003
@@ -13,7 +13,7 @@
function method1() {
print __CLASS__.::.__FUNCTION__.\n;
- return @$this-foo;
+ return $this-foo;
}
function method2() {
@@ -23,7 +23,7 @@
function method3() {
print __CLASS__.::.__FUNCTION__.\n;
- return @$this-foo;
+ return $this-foo;
}
}
--
First they ignore you, then they laugh at you,
then they fight you, then you win.
- Gandhi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml xml.c
sterlingWed Jul 2 16:05:13 2003 EDT
Modified files:
/php-src/ext/xmlxml.c
Log:
Not really the best way to solve this. But it doesn't give a segfault on
self-referential structures, which is always a bonus
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.133 php-src/ext/xml/xml.c:1.134
--- php-src/ext/xml/xml.c:1.133 Sat Jun 14 14:14:05 2003
+++ php-src/ext/xml/xml.c Wed Jul 2 16:05:13 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.133 2003/06/14 18:14:05 rrichards Exp $ */
+/* $Id: xml.c,v 1.134 2003/07/02 20:05:13 sterling Exp $ */
#define IS_EXT_MODULE
@@ -374,17 +374,17 @@
/* {{{ xml_set_handler() */
static void xml_set_handler(zval **handler, zval **data)
{
- /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */
- if (Z_TYPE_PP(data) != IS_ARRAY) {
- convert_to_string_ex(data);
- }
-
/* If we have already a handler, release it */
if (*handler) {
zval_ptr_dtor(handler);
}
- zval_add_ref(data);
+ /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */
+ if (Z_TYPE_PP(data) != IS_ARRAY) {
+ convert_to_string_ex(data);
+ zval_add_ref(data);
+ }
+
*handler = *data;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sess_sqlite.c
sterlingTue Jul 1 20:03:41 2003 EDT
Modified files:
/php-src/ext/sqlite sess_sqlite.c
Log:
make this actually work.
Index: php-src/ext/sqlite/sess_sqlite.c
diff -u php-src/ext/sqlite/sess_sqlite.c:1.3 php-src/ext/sqlite/sess_sqlite.c:1.4
--- php-src/ext/sqlite/sess_sqlite.c:1.3Tue Jul 1 13:55:32 2003
+++ php-src/ext/sqlite/sess_sqlite.cTue Jul 1 20:03:41 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: sess_sqlite.c,v 1.3 2003/07/01 17:55:32 helly Exp $ */
+/* $Id: sess_sqlite.c,v 1.4 2003/07/02 00:03:41 sterling Exp $ */
#include php.h
@@ -88,6 +88,8 @@
/* allow up to 1 minute when busy */
sqlite_busy_timeout(db, 6);
+ /* sqlite_exec(db, PRAGMA default_synchronous = OFF, NULL, NULL, NULL); */
+
/* This will fail if the table already exists, but that's not a big problem.
I'm
unclear as to how to check for a table's existence in SQLite -- that would
be better here. */
sqlite_exec(db, CREATE_TBL_QUERY, NULL, NULL, NULL);
@@ -110,11 +112,15 @@
{
PS_SQLITE_DATA;
char *query;
+ const char *tail;
sqlite_vm *vm;
int colcount, result;
const char **rowdata, **colnames;
char *error;
+ *val = NULL;
+ *vallen = 0;
+
if (!ps_sqlite_valid_key(key)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: The session id
contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,');
return FAILURE;
@@ -126,7 +132,7 @@
return FAILURE;
}
- if (sqlite_compile(db, query, NULL, vm, error) != SQLITE_OK) {
+ if (sqlite_compile(db, query, tail, vm, error) != SQLITE_OK) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: Could not compile
session read query: %s, error);
sqlite_freemem(error);
sqlite_freemem(query);
@@ -135,10 +141,7 @@
switch ((result = sqlite_step(vm, colcount, rowdata, colnames))) {
case SQLITE_ROW:
- if (rowdata[0] == NULL) {
- *vallen = 0;
- *val = NULL;
- } else {
+ if (rowdata[0] != NULL) {
*vallen = strlen(rowdata[0]);
*val = emalloc(*vallen);
*vallen = sqlite_decode_binary(rowdata[0], *val);
@@ -146,7 +149,7 @@
}
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: session
read query failed: %s, error);
+ //php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: session
read query failed: %s, error);
sqlite_freemem(error);
error = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sess_sqlite.c
sterlingTue Jul 1 20:04:58 2003 EDT Modified files: /php-src/ext/sqlite sess_sqlite.c Log: no c++ style comments Index: php-src/ext/sqlite/sess_sqlite.c diff -u php-src/ext/sqlite/sess_sqlite.c:1.4 php-src/ext/sqlite/sess_sqlite.c:1.5 --- php-src/ext/sqlite/sess_sqlite.c:1.4Tue Jul 1 20:03:41 2003 +++ php-src/ext/sqlite/sess_sqlite.cTue Jul 1 20:04:58 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: sess_sqlite.c,v 1.4 2003/07/02 00:03:41 sterling Exp $ */ +/* $Id: sess_sqlite.c,v 1.5 2003/07/02 00:04:58 sterling Exp $ */ #include php.h @@ -149,7 +149,6 @@ } break; default: - //php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: session read query failed: %s, error); sqlite_freemem(error); error = NULL; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sess_sqlite.c
sterlingTue Jul 1 20:43:00 2003 EDT
Modified files:
/php-src/ext/sqlite sess_sqlite.c
Log:
set synching to off
cleanup some silly code
Index: php-src/ext/sqlite/sess_sqlite.c
diff -u php-src/ext/sqlite/sess_sqlite.c:1.5 php-src/ext/sqlite/sess_sqlite.c:1.6
--- php-src/ext/sqlite/sess_sqlite.c:1.5Tue Jul 1 20:04:58 2003
+++ php-src/ext/sqlite/sess_sqlite.cTue Jul 1 20:43:00 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: sess_sqlite.c,v 1.5 2003/07/02 00:04:58 sterling Exp $ */
+/* $Id: sess_sqlite.c,v 1.6 2003/07/02 00:43:00 sterling Exp $ */
#include php.h
@@ -25,17 +25,11 @@
#include ext/session/php_session.h
#include sqlite.h
-
+#define SQLITE_RETVAL(__r) ((__r) == SQLITE_OK ? SUCCESS : FAILURE)
#define PS_SQLITE_DATA sqlite *db = (sqlite*)PS_GET_MOD_DATA()
extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out);
extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
-#define CREATE_TBL_QUERY CREATE TABLE session_data(sess_id TEXT PRIMARY KEY,
value TEXT, updated INTEGER)
-#define INSERT_QUERY REPLACE INTO session_data VALUES('%q', '%q', %d)
-#define SELECT_QUERY SELECT value FROM session_data WHERE sess_id='%q'
LIMIT 1
-#define GC_QUERY DELETE FROM session_data WHERE (%d - updated)
%d
-#define DELETE_QUERY DELETE FROM session_data WHERE sess_id='%q'
-
PS_FUNCS(sqlite);
ps_module ps_mod_sqlite = {
@@ -88,11 +82,15 @@
/* allow up to 1 minute when busy */
sqlite_busy_timeout(db, 6);
- /* sqlite_exec(db, PRAGMA default_synchronous = OFF, NULL, NULL, NULL); */
+ sqlite_exec(db, PRAGMA default_synchronous = OFF, NULL, NULL, NULL);
/* This will fail if the table already exists, but that's not a big problem.
I'm
unclear as to how to check for a table's existence in SQLite -- that would
be better here. */
- sqlite_exec(db, CREATE_TBL_QUERY, NULL, NULL, NULL);
+ sqlite_exec(db,
+ CREATE TABLE session_data (
+ sess_id TEXT PRIMARY KEY,
+ value TEXT, updated INTEGER
+ ), NULL, NULL, NULL);
PS_SET_MOD_DATA(db);
@@ -126,7 +124,7 @@
return FAILURE;
}
- query = sqlite_mprintf(SELECT_QUERY, key);
+ query = sqlite_mprintf(SELECT value FROM session_data WHERE sess_id='%q'
LIMIT 1, key);
if (query == NULL) {
/* no memory */
return FAILURE;
@@ -168,42 +166,47 @@
{
PS_SQLITE_DATA;
char *error;
- int result = SUCCESS;
time_t t;
char *binary;
int binlen;
+ int rv;
t = time(NULL);
binary = emalloc((256 * vallen + 1262) / 253);
binlen = sqlite_encode_binary((const unsigned char*)val, vallen, binary);
- if (SQLITE_OK != sqlite_exec_printf(db, INSERT_QUERY, NULL, NULL, error, key,
binary, t)) {
+ rv = sqlite_exec_printf(db, REPLACE INTO session_data VALUES('%q', '%q',
%d), NULL, NULL, error, key, binary, t);
+ if (rv != SQLITE_OK) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: session write
query failed: %s, error);
sqlite_freemem(error);
- result = FAILURE;
}
-
efree(binary);
- return result;
+ SQLITE_RETVAL(rv);
}
PS_DESTROY_FUNC(sqlite)
{
+ int rv;
PS_SQLITE_DATA;
- return SQLITE_OK == sqlite_exec_printf(db, DELETE_QUERY, NULL, NULL, NULL,
key) ?
- SUCCESS : FAILURE;
+ rv = sqlite_exec_printf(db, DELETE FROM session_data WHERE sess_id='%q',
NULL, NULL, NULL, key);
+
+ SQLITE_RETVAL(rv);return rv == SQLITE_OK ? SUCCESS : FAILURE;
}
PS_GC_FUNC(sqlite)
{
PS_SQLITE_DATA;
+ int rv;
time_t t = time(NULL);
- return SQLITE_OK == sqlite_exec_printf(db, GC_QUERY, NULL, NULL, NULL, t,
maxlifetime) ?
- SUCCESS : FAILURE;
+ rv = sqlite_exec_printf(db,
+ DELETE FROM session_data WHERE (%d - updated) %d,
+ NULL, NULL, NULL, t, maxlifetime);
+
+ SQLITE_RETVAL(rv);
}
#endif /* HAVE_PHP_SESSION */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sess_sqlite.c
sterlingTue Jul 1 20:45:16 2003 EDT Modified files: /php-src/ext/sqlite sess_sqlite.c Log: ws fix Index: php-src/ext/sqlite/sess_sqlite.c diff -u php-src/ext/sqlite/sess_sqlite.c:1.6 php-src/ext/sqlite/sess_sqlite.c:1.7 --- php-src/ext/sqlite/sess_sqlite.c:1.6Tue Jul 1 20:43:00 2003 +++ php-src/ext/sqlite/sess_sqlite.cTue Jul 1 20:45:15 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: sess_sqlite.c,v 1.6 2003/07/02 00:43:00 sterling Exp $ */ +/* $Id: sess_sqlite.c,v 1.7 2003/07/02 00:45:15 sterling Exp $ */ #include php.h @@ -88,7 +88,7 @@ unclear as to how to check for a table's existence in SQLite -- that would be better here. */ sqlite_exec(db, CREATE TABLE session_data ( - sess_id TEXT PRIMARY KEY, + sess_id TEXT PRIMARY KEY, value TEXT, updated INTEGER ), NULL, NULL, NULL); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sess_sqlite.c
sterlingTue Jul 1 20:56:32 2003 EDT
Modified files:
/php-src/ext/sqlite sess_sqlite.c
Log:
not necessary, already assumed binary safe (it has to be under the current
session architecture), and anything else is fair play
Index: php-src/ext/sqlite/sess_sqlite.c
diff -u php-src/ext/sqlite/sess_sqlite.c:1.7 php-src/ext/sqlite/sess_sqlite.c:1.8
--- php-src/ext/sqlite/sess_sqlite.c:1.7Tue Jul 1 20:45:15 2003
+++ php-src/ext/sqlite/sess_sqlite.cTue Jul 1 20:56:32 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: sess_sqlite.c,v 1.7 2003/07/02 00:45:15 sterling Exp $ */
+/* $Id: sess_sqlite.c,v 1.8 2003/07/02 00:56:32 sterling Exp $ */
#include php.h
@@ -36,36 +36,6 @@
PS_MOD(sqlite)
};
-/* If you change the logic here, please also update the error message in
- * ps_sqlite_open() appropriately (code taken from ps_files_valid_key()) */
-
-static int ps_sqlite_valid_key(const char *key)
-{
- size_t len;
- const char *p;
- char c;
- int ret = 1;
-
- for (p = key; (c = *p); p++) {
- /* valid characters are a..z,A..Z,0..9 */
- if (!((c = 'a' c = 'z')
- || (c = 'A' c = 'Z')
- || (c = '0' c = '9')
- || c == ','
- || c == '-')) {
- ret = 0;
- break;
- }
- }
-
- len = p - key;
-
- if (len == 0)
- ret = 0;
-
- return ret;
-}
-
PS_OPEN_FUNC(sqlite)
{
char *errmsg = NULL;
@@ -119,11 +89,6 @@
*val = NULL;
*vallen = 0;
- if (!ps_sqlite_valid_key(key)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: The session id
contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,');
- return FAILURE;
- }
-
query = sqlite_mprintf(SELECT value FROM session_data WHERE sess_id='%q'
LIMIT 1, key);
if (query == NULL) {
/* no memory */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sess_sqlite.c
sterlingTue Jul 1 23:12:06 2003 EDT
Modified files:
/php-src/ext/sqlite sess_sqlite.c
Log:
further improve the performance and clean up
Index: php-src/ext/sqlite/sess_sqlite.c
diff -u php-src/ext/sqlite/sess_sqlite.c:1.8 php-src/ext/sqlite/sess_sqlite.c:1.9
--- php-src/ext/sqlite/sess_sqlite.c:1.8Tue Jul 1 20:56:32 2003
+++ php-src/ext/sqlite/sess_sqlite.cTue Jul 1 23:12:06 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: sess_sqlite.c,v 1.8 2003/07/02 00:56:32 sterling Exp $ */
+/* $Id: sess_sqlite.c,v 1.9 2003/07/02 03:12:06 sterling Exp $ */
#include php.h
@@ -44,7 +44,8 @@
/* TODO: do we need a safe_mode check here? */
db = sqlite_open(save_path, 0666, errmsg);
if (db == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite: failed to
open/create session database `%s' - %s, save_path, errmsg);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ SQLite: failed to open/create session database `%s' -
%s, save_path, errmsg);
sqlite_freemem(errmsg);
return FAILURE;
}
@@ -53,13 +54,15 @@
sqlite_busy_timeout(db, 6);
sqlite_exec(db, PRAGMA default_synchronous = OFF, NULL, NULL, NULL);
-
+ sqlite_exec(db, PRAGMA count_changes = OFF, NULL, NULL, NULL);
+
/* This will fail if the table already exists, but that's not a big problem.
I'm
unclear as to how to check for a table's existence in SQLite -- that would
be better here. */
sqlite_exec(db,
CREATE TABLE session_data (
- sess_id TEXT PRIMARY KEY,
- value TEXT, updated INTEGER
+ sess_id PRIMARY KEY,
+ value TEXT,
+ updated INTEGER
), NULL, NULL, NULL);
PS_SET_MOD_DATA(db);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session/tests 016.phpt
sterlingWed Jul 2 00:34:18 2003 EDT Modified files: /php-src/ext/session/tests 016.phpt Log: fix this test when using a save_handler other than files... Index: php-src/ext/session/tests/016.phpt diff -u php-src/ext/session/tests/016.phpt:1.2 php-src/ext/session/tests/016.phpt:1.3 --- php-src/ext/session/tests/016.phpt:1.2 Mon Nov 25 18:20:05 2002 +++ php-src/ext/session/tests/016.phpt Wed Jul 2 00:34:18 2003 @@ -6,6 +6,7 @@ session.save_path=123;:/really\\completely:::/invalid;;,23123;213 session.use_cookies=0 session.cache_limiter= +session.save_handler=files session.serialize_handler=php --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests 002.phpt 002.xml
sterlingMon Jun 30 14:09:12 2003 EDT
Added files:
/php-src/ext/simplexml/tests002.phpt 002.xml
Log:
add a test for shane's bug #24392
Index: php-src/ext/simplexml/tests/002.phpt
+++ php-src/ext/simplexml/tests/002.phpt
--TEST--
Checking bug #24392, empty namespaces causing confusion
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--POST--
--GET--
--INI--
--FILE--
?php
$s = simplexml_load_file('ext/simplexml/tests/002.xml');
foreach ($s-item as $item) {
echo $item-title . \n;
}
?
--EXPECT--
EU Parliament to Vote on New Patent Rules
Most Powerful Amateur Rocket in Canada
GF FX 5900 Ultra vs. ATi Radeon 9800 Pro
PHP 5 Beta 1
Engaging with the OSS Community
Pure Math, Pure Joy
Windows Tech Writer Looks at Linux
US Cell Phone Users Discover SMS Spam
Verizon Sues Nextel For Espionage
Introduction to Debian
Index: php-src/ext/simplexml/tests/002.xml
+++ php-src/ext/simplexml/tests/002.xml
?xml version=1.0?
rdf:RDF
xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
xmlns=http://my.netscape.com/rdf/simple/0.9/;
channel
titleSlashdot/title
linkhttp://slashdot.org//link
descriptionNews for nerds, stuff that matters/description
/channel
image
titleSlashdot/title
urlhttp://images.slashdot.org/topics/topicslashdot.gif/url
linkhttp://slashdot.org//link
/image
item
titleEU Parliament to Vote on New Patent Rules/title
linkhttp://slashdot.org/article.pl?sid=03/06/30/002211/link
/item
item
titleMost Powerful Amateur Rocket in Canada/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/2121211/link
/item
item
titleGF FX 5900 Ultra vs. ATi Radeon 9800 Pro/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/202218/link
/item
item
titlePHP 5 Beta 1/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/1957253/link
/item
item
titleEngaging with the OSS Community/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/1913235/link
/item
item
titlePure Math, Pure Joy/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/183258/link
/item
item
titleWindows Tech Writer Looks at Linux/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/1554201/link
/item
item
titleUS Cell Phone Users Discover SMS Spam/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/1542249/link
/item
item
titleVerizon Sues Nextel For Espionage/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/1443230/link
/item
item
titleIntroduction to Debian/title
linkhttp://slashdot.org/article.pl?sid=03/06/29/1424213/link
/item
textinput
titleSearch Slashdot/title
descriptionSearch Slashdot stories/description
namequery/name
linkhttp://slashdot.org/search.pl/link
/textinput
/rdf:RDF
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes bug20120.phpt
sterlingMon Jun 30 15:16:36 2003 EDT Removed files: /php-src/tests/classes bug20120.phpt Log: its not a bug - its a feature. No longer allowed in ze2. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes bug24399.phpt
sterlingMon Jun 30 15:40:48 2003 EDT
Added files:
/php-src/tests/classes bug24399.phpt
Log:
test for bug #24399, segfault in is_subclass_of()
Index: php-src/tests/classes/bug24399.phpt
+++ php-src/tests/classes/bug24399.phpt
--TEST--
Bug #24399: is_subclass_of() crashes when parent class doesn't exist.
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class dooh {
var $blah;
}
$d = new dooh;
var_dump(is_subclass_of($d, 'dooh'));
?
--EXPECT--
bool(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/tests/general_functions sunfuncts.phpt
sterlingMon Jun 30 15:50:18 2003 EDT Modified files: /php-src/ext/standard/tests/general_functions sunfuncts.phpt Log: this is the correct result Index: php-src/ext/standard/tests/general_functions/sunfuncts.phpt diff -u php-src/ext/standard/tests/general_functions/sunfuncts.phpt:1.4 php-src/ext/standard/tests/general_functions/sunfuncts.phpt:1.5 --- php-src/ext/standard/tests/general_functions/sunfuncts.phpt:1.4 Sat Jun 28 13:36:46 2003 +++ php-src/ext/standard/tests/general_functions/sunfuncts.phpt Mon Jun 30 15:50:18 2003 @@ -32,7 +32,7 @@ 1054340319 18:39 18.656400943241 1056931476 04:36 4.6161204505189 1056932328 18:48 18.808871657766 -1059609894 04:54 4.9068825098365 +1059609894 04:54 4.9068825098364 1059610715 18:35 18.599286002028 1062288314 05:14 5.2368895570738 1062289083 18:03 18.060541787879 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions sunfuncts.phpt
sterlingMon Jun 30 16:03:17 2003 EDT Modified files: /php-src/ext/standard/tests/general_functions sunfuncts.phpt Log: set precision properly.. test passes here Index: php-src/ext/standard/tests/general_functions/sunfuncts.phpt diff -u php-src/ext/standard/tests/general_functions/sunfuncts.phpt:1.5 php-src/ext/standard/tests/general_functions/sunfuncts.phpt:1.6 --- php-src/ext/standard/tests/general_functions/sunfuncts.phpt:1.5 Mon Jun 30 15:50:18 2003 +++ php-src/ext/standard/tests/general_functions/sunfuncts.phpt Mon Jun 30 16:03:17 2003 @@ -1,7 +1,7 @@ --TEST-- date_sunrise() and date_sunset() functions --INI-- -precision = 14 +precision=14 --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml compat.c
sterlingSun Jun 29 14:26:23 2003 EDT Modified files: /php-src/ext/xmlcompat.c Log: fix libxml2 when dealing with character data Index: php-src/ext/xml/compat.c diff -u php-src/ext/xml/compat.c:1.15 php-src/ext/xml/compat.c:1.16 --- php-src/ext/xml/compat.c:1.15 Thu Jun 26 00:08:54 2003 +++ php-src/ext/xml/compat.cSun Jun 29 14:26:23 2003 @@ -273,7 +273,11 @@ _comment_handler, /* comment */ NULL, /* warning */ NULL, /* error */ - NULL /* fatalError */ + NULL, /* fatalError */ + NULL, /* getParameterEntity */ + _cdata_handler, /* cdataBlock */ + NULL, /* externalSubset */ + 1 }; XML_Parser -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sterlingSun Jun 29 15:41:40 2003 EDT Modified files: /php-srcNEWS Log: update to beta Index: php-src/NEWS diff -u php-src/NEWS:1.1432 php-src/NEWS:1.1433 --- php-src/NEWS:1.1432 Sat Jun 28 19:37:18 2003 +++ php-src/NEWSSun Jun 29 15:41:39 2003 @@ -2,7 +2,7 @@ ||| ? ? ??? 200?, Version 5.0.0 -? ? ??? 2003, PHP 5 Beta 1 +29 Jun 2003, PHP 5 Beta 1 - Fixed corruption of multibyte character including 0x5c as second byte in multipart/form-data. (Rui) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sterlingSun Jun 29 15:42:29 2003 EDT Modified files: /php-srcNEWS Log: add ![CDATA[ ]] fixes Index: php-src/NEWS diff -u php-src/NEWS:1.1433 php-src/NEWS:1.1434 --- php-src/NEWS:1.1433 Sun Jun 29 15:41:39 2003 +++ php-src/NEWSSun Jun 29 15:42:29 2003 @@ -2,6 +2,11 @@ ||| ? ? ??? 200?, Version 5.0.0 +?? ??? 2003, PHP 5 Beta 2 + +- Fix support for ![CDATA[]] fields within XML documents in ext/xml. + (Sterling) + 29 Jun 2003, PHP 5 Beta 1 - Fixed corruption of multibyte character including 0x5c as second -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingSun Jun 29 23:11:03 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
and my first user doesn't even like goto's. sniffle
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.45 php-src/ext/simplexml/simplexml.c:1.46
--- php-src/ext/simplexml/simplexml.c:1.45 Sun Jun 29 23:08:48 2003
+++ php-src/ext/simplexml/simplexml.c Sun Jun 29 23:11:03 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.45 2003/06/30 03:08:48 sterling Exp $ */
+/* $Id: simplexml.c,v 1.46 2003/06/30 03:11:03 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -147,10 +147,10 @@
while (node) {
SKIP_TEXT(node);
- if (node-ns) {
+ do if (node-ns) {
if (node-parent-ns) {
if (!xmlStrcmp(node-ns-href,
node-parent-ns-href)) {
- goto this_iter;
+ break;
}
}
@@ -160,8 +160,7 @@
APPEND_CUR_ELEMENT(counter, value);
goto next_iter;
}
- }
-this_iter:
+ } while (0);
if (!xmlStrcmp(node-name, name)) {
APPEND_PREV_ELEMENT(counter, value);
@@ -1060,7 +1059,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.45 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.46 $);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl config.m4
sterlingMon Jun 30 01:01:18 2003 EDT Modified files: /php-src/ext/xslconfig.m4 Log: fix by Elfyn, use = not == Index: php-src/ext/xsl/config.m4 diff -u php-src/ext/xsl/config.m4:1.4 php-src/ext/xsl/config.m4:1.5 --- php-src/ext/xsl/config.m4:1.4 Thu Jun 26 14:51:52 2003 +++ php-src/ext/xsl/config.m4 Mon Jun 30 01:01:18 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.4 2003/06/26 18:51:52 helly Exp $ +dnl $Id: config.m4,v 1.5 2003/06/30 05:01:18 sterling Exp $ dnl AC_DEFUN(PHP_XSL_CHECK_VERSION,[ @@ -23,7 +23,7 @@ [ --with-xsl[=DIR]Include new XSL support (requires libxslt = 1.0.18). DIR is the libxslt install directory.]) -if test $PHP_XSL != no -a $PHP_DOM == no; then +if test $PHP_XSL != no -a $PHP_DOM = no; then AC_MSG_ERROR([XSL extension requires DOM extension, add --with-dom.]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sterlingSat Jun 28 02:32:02 2003 EDT Modified files: /php-srcacinclude.m4 Log: ilia points out this is ok Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.249 php-src/acinclude.m4:1.250 --- php-src/acinclude.m4:1.249 Sat Jun 28 01:18:11 2003 +++ php-src/acinclude.m4Sat Jun 28 02:32:02 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.249 2003/06/28 05:18:11 sterling Exp $ +dnl $Id: acinclude.m4,v 1.250 2003/06/28 06:32:02 sterling Exp $ dnl dnl This file contains local autoconf functions. @@ -1736,7 +1736,7 @@ set $libxml_full_version IFS=$ac_IFS LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3` -if test $LIBXML_VERSION -ge 2005007; then +if test $LIBXML_VERSION -ge 2005001; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) @@ -1744,7 +1744,7 @@ AC_DEFINE(HAVE_LIBXML, 1, [ ]) $2 else - AC_MSG_ERROR([libxml2 version 2.5.7 or greater required.]) + AC_MSG_ERROR([libxml2 version 2.5.1 or greater required.]) fi ifelse([$3],[],,[else $3]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingSat Jun 28 03:46:03 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
for now we let xml support build with versions older than 2.5.7, as we want
users to actually test this...
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.42 php-src/ext/simplexml/simplexml.c:1.43
--- php-src/ext/simplexml/simplexml.c:1.42 Wed Jun 25 12:26:32 2003
+++ php-src/ext/simplexml/simplexml.c Sat Jun 28 03:46:03 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.42 2003/06/25 16:26:32 sterling Exp $ */
+/* $Id: simplexml.c,v 1.43 2003/06/28 07:46:03 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -543,6 +543,8 @@
#define SCHEMA_BLOB 1
#define SCHEMA_OBJECT 2
+#ifdef xmlSchemaParserCtxtPtr
+
/* {{{ simplexml_ce_schema_validate_file()
*/
static void
@@ -590,6 +592,8 @@
}
/* }}} */
+#endif
+
/* {{{ simplexml_ce_register_ns()
*/
static void
@@ -657,10 +661,12 @@
{
if (!strcmp(method, xsearch)) {
simplexml_ce_xpath_search(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+#ifdef xmlSchemaParserCtxtPtr
} else if (!strcmp(method, validate_schema_file)) {
simplexml_ce_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
SCHEMA_FILE);
} else if (!strcmp(method, validate_schema_buffer)) {
simplexml_ce_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
SCHEMA_BLOB);
+#endif
} else if (!strcmp(method, register_ns)) {
simplexml_ce_register_ns(INTERNAL_FUNCTION_PARAM_PASSTHRU);
} else if (!strcmp(method, to_xml)) {
@@ -1042,7 +1048,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.42 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.43 $);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / makedist
sterlingSat Jun 28 19:32:05 2003 EDT Modified files: /php-srcmakedist Log: what's a php5? Index: php-src/makedist diff -u php-src/makedist:1.30 php-src/makedist:1.31 --- php-src/makedist:1.30 Wed May 21 20:31:31 2003 +++ php-src/makedistSat Jun 28 19:32:04 2003 @@ -24,7 +24,7 @@ # # Written by Stig Bakken [EMAIL PROTECTED] 1997-05-28. # -# $Id: makedist,v 1.30 2003/05/22 00:31:31 wez Exp $ +# $Id: makedist,v 1.31 2003/06/28 23:32:04 sterling Exp $ # if test $# != 2; then @@ -45,7 +45,7 @@ IFS=$old_IFS PHPROOT=:pserver:[EMAIL PROTECTED]:/repository -PHPMOD=php5 +PHPMOD=php-src LT_TARGETS='ltconfig ltmain.sh config.guess config.sub' if echo '\c' | grep -s c /dev/null 21 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
sterlingFri Jun 27 10:32:13 2003 EDT
Modified files:
/CVSROOTloginfo
Log:
re-arrange this so hopefully we send emails to the correct list
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.96 CVSROOT/loginfo:1.97
--- CVSROOT/loginfo:1.96Thu Jun 26 17:15:58 2003
+++ CVSROOT/loginfo Fri Jun 27 10:32:13 2003
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.96 2003/06/26 21:15:58 sterling
Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.97 2003/06/27 14:32:13 sterling
Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -90,12 +90,12 @@
^pres$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
^portal $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^curl-www$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^curl-perl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^curl-java $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^curl-php$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
^curl-cpp$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
# misc stuff
^jpgraph $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h
sterlingFri Jun 27 18:09:12 2003 EDT Modified files: /php-srcconfigure.in /php-src/main php_version.h Log: beta 1 Index: php-src/configure.in diff -u php-src/configure.in:1.450 php-src/configure.in:1.451 --- php-src/configure.in:1.450 Fri Jun 27 03:12:54 2003 +++ php-src/configure.inFri Jun 27 18:09:12 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.450 2003/06/27 07:12:54 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.451 2003/06/27 22:09:12 sterling Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=0 -EXTRA_VERSION=-dev +EXTRA_VERSION=b1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.68 php-src/main/php_version.h:1.69 --- php-src/main/php_version.h:1.68 Thu Jan 9 05:03:26 2003 +++ php-src/main/php_version.h Fri Jun 27 18:09:12 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.0.0-dev +#define PHP_EXTRA_VERSION b1 +#define PHP_VERSION 5.0.0b1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre config.m4
sterlingSat Jun 28 00:30:51 2003 EDT Modified files: /php-src/ext/pcre config.m4 Log: define this here too Index: php-src/ext/pcre/config.m4 diff -u php-src/ext/pcre/config.m4:1.31 php-src/ext/pcre/config.m4:1.32 --- php-src/ext/pcre/config.m4:1.31 Fri Jun 27 12:31:23 2003 +++ php-src/ext/pcre/config.m4 Sat Jun 28 00:30:51 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.31 2003/06/27 16:31:23 andrei Exp $ +dnl $Id: config.m4,v 1.32 2003/06/28 04:30:51 sterling Exp $ dnl dnl By default we'll compile and link against the bundled PCRE library @@ -13,7 +13,7 @@ if test $PHP_PCRE_REGEX != no; then if test $PHP_PCRE_REGEX = yes; then -PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 [EMAIL PROTECTED]@/pcrelib) +PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 [EMAIL PROTECTED]@/pcrelib) PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) else -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sterlingSat Jun 28 01:18:11 2003 EDT Modified files: /php-srcacinclude.m4 Log: bump up to 2.5.7 Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.248 php-src/acinclude.m4:1.249 --- php-src/acinclude.m4:1.248 Tue Jun 24 12:39:52 2003 +++ php-src/acinclude.m4Sat Jun 28 01:18:11 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.248 2003/06/24 16:39:52 sniper Exp $ +dnl $Id: acinclude.m4,v 1.249 2003/06/28 05:18:11 sterling Exp $ dnl dnl This file contains local autoconf functions. @@ -1736,7 +1736,7 @@ set $libxml_full_version IFS=$ac_IFS LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3` -if test $LIBXML_VERSION -ge 2004014; then +if test $LIBXML_VERSION -ge 2005007; then LIBXML_LIBS=`$XML2_CONFIG --libs` LIBXML_INCS=`$XML2_CONFIG --cflags` PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) @@ -1744,7 +1744,7 @@ AC_DEFINE(HAVE_LIBXML, 1, [ ]) $2 else - AC_MSG_ERROR([libxml2 version 2.4.14 or greater required.]) + AC_MSG_ERROR([libxml2 version 2.5.7 or greater required.]) fi ifelse([$3],[],,[else $3]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sterlingSat Jun 28 01:22:39 2003 EDT Modified files: /php-srcNEWS Log: there is no domxml :) Index: php-src/NEWS diff -u php-src/NEWS:1.1430 php-src/NEWS:1.1431 --- php-src/NEWS:1.1430 Fri Jun 27 06:43:01 2003 +++ php-src/NEWSSat Jun 28 01:22:39 2003 @@ -63,12 +63,6 @@ - Changed uniqid() parameters to be optional and allow any prefix length. (Marcus) -- Added new methods to ext/domxml: (Rob Richards, Chregu, Lukas Schröder) - . domdocument-create_document_fragment() - . documentfragment-open_mem() - . domelement-set_attribute_node() - . domxmlnode-get_path() - - Added new iconv functions. (Moriyoshi) . iconv_strlen() . iconv_substr() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
sterlingThu Jun 26 17:15:58 2003 EDT
Modified files:
/CVSROOTloginfo
Log:
send these to the appropriate mailing lists
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.95 CVSROOT/loginfo:1.96
--- CVSROOT/loginfo:1.95Wed Jun 25 19:45:55 2003
+++ CVSROOT/loginfo Thu Jun 26 17:15:58 2003
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.95 2003/06/25 23:45:55 sterling
Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.96 2003/06/26 21:15:58 sterling
Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -90,12 +90,12 @@
^pres$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
^portal $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-www$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-perl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-java $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-php$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-cpp$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^curl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-www$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-perl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-java $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-php$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-cpp$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
# misc stuff
^jpgraph $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
sterlingWed Jun 25 12:26:32 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
allow the root element to be accessed as a text node
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.41 php-src/ext/simplexml/simplexml.c:1.42
--- php-src/ext/simplexml/simplexml.c:1.41 Sat Jun 14 14:15:50 2003
+++ php-src/ext/simplexml/simplexml.c Wed Jun 25 12:26:32 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.41 2003/06/14 18:15:50 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.42 2003/06/25 16:26:32 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -738,12 +738,18 @@
zval_dtor(writeobj);
}
+ if (!sxe-node) {
+ if (sxe-document) {
+ sxe-node = xmlDocGetRootElement((xmlDocPtr)
sxe-document-ptr);
+ }
+ }
+
if (sxe-node) {
contents = xmlNodeListGetString((xmlDocPtr) sxe-document-ptr,
sxe-node-children, 1);
if (!xmlIsBlankNode(sxe-node-children) contents) {
cast_object(writeobj, type, NULL TSRMLS_CC);
}
- }
+ }
cast_object(writeobj, type, contents TSRMLS_CC);
@@ -1036,7 +1042,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.41 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.42 $);
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
sterlingWed Jun 25 13:22:31 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Don't pass resource as an argument when its not being parsed.
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.59 php-src/ext/sqlite/sqlite.c:1.60
--- php-src/ext/sqlite/sqlite.c:1.59Wed Jun 25 12:59:24 2003
+++ php-src/ext/sqlite/sqlite.c Wed Jun 25 13:22:31 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.59 2003/06/25 16:59:24 iliaa Exp $
+ $Id: sqlite.c,v 1.60 2003/06/25 17:22:31 sterling Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -935,7 +935,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.59 2003/06/25 16:59:24 iliaa Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.60 2003/06/25 17:22:31 sterling Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -2385,7 +2385,7 @@
zval *object = getThis();
if (object) {
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
sz|l, zdb, funcname, funcname_len, zcall, num_args)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
sz|l, funcname, funcname_len, zcall, num_args)) {
return;
}
DB_FROM_OBJECT(db, object);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom config.m4
sterlingWed Jun 25 14:06:06 2003 EDT Modified files: /php-src/ext/domconfig.m4 Log: autodetect zlib if dom is enabled Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.5 php-src/ext/dom/config.m4:1.6 --- php-src/ext/dom/config.m4:1.5 Wed Jun 25 11:31:59 2003 +++ php-src/ext/dom/config.m4 Wed Jun 25 14:06:06 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.5 2003/06/25 15:31:59 sterling Exp $ +dnl $Id: config.m4,v 1.6 2003/06/25 18:06:06 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -29,7 +29,6 @@ fi if test $PHP_DOM != no; then - DOM_DIR_ADD= if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then DOM_DIR=$PHP_DOM @@ -66,6 +65,16 @@ fi PHP_ADD_INCLUDE($DOM_DIR/include$DOM_DIR_ADD) + + dnl Search for the zlib directory + + if test $PHP_ZLIB_DIR = no; then + for i in /usr /usr/local; do + if test -r $i/lib/libz.so; then + PHP_ZLIB_DIR=$i + fi + done + fi if test $PHP_ZLIB_DIR = no; then AC_MSG_ERROR(DOM requires ZLIB. Use --with-zlib-dir=DIR) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/dom config.m4
On Wed, 2003-06-25 at 15:12, Andi Gutmans wrote: So is DOM enabled by default? So what is new DOM support which is no during configure? Hmm? :) Its not enabled by default iirc, but when it is, zlib-dir is now detected. -Sterling. Andi At 06:06 PM 6/25/2003 +, Sterling Hughes wrote: sterlingWed Jun 25 14:06:06 2003 EDT Modified files: /php-src/ext/domconfig.m4 Log: autodetect zlib if dom is enabled Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.5 php-src/ext/dom/config.m4:1.6 --- php-src/ext/dom/config.m4:1.5 Wed Jun 25 11:31:59 2003 +++ php-src/ext/dom/config.m4 Wed Jun 25 14:06:06 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.5 2003/06/25 15:31:59 sterling Exp $ +dnl $Id: config.m4,v 1.6 2003/06/25 18:06:06 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -29,7 +29,6 @@ fi if test $PHP_DOM != no; then - DOM_DIR_ADD= if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then DOM_DIR=$PHP_DOM @@ -66,6 +65,16 @@ fi PHP_ADD_INCLUDE($DOM_DIR/include$DOM_DIR_ADD) + + dnl Search for the zlib directory + + if test $PHP_ZLIB_DIR = no; then + for i in /usr /usr/local; do + if test -r $i/lib/libz.so; then + PHP_ZLIB_DIR=$i + fi + done + fi if test $PHP_ZLIB_DIR = no; then AC_MSG_ERROR(DOM requires ZLIB. Use --with-zlib-dir=DIR) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Programming today is a race between software engineers stirring to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning. - Unknown -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom config.m4 /ext/simplexml config.m4 /ext/xml config.m4
sterlingWed Jun 25 16:53:52 2003 EDT Modified files: /php-src/ext/domconfig.m4 /php-src/ext/simplexml config.m4 /php-src/ext/xmlconfig.m4 Log: these should be enabled by default. At least this much was agreed upon when the decision to debundle libxml2 was made. Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.6 php-src/ext/dom/config.m4:1.7 --- php-src/ext/dom/config.m4:1.6 Wed Jun 25 14:06:06 2003 +++ php-src/ext/dom/config.m4 Wed Jun 25 16:53:52 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6 2003/06/25 18:06:06 sterling Exp $ +dnl $Id: config.m4,v 1.7 2003/06/25 20:53:52 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -21,7 +21,7 @@ PHP_ARG_WITH(dom, for new DOM support, [ --with-dom[=DIR] Include new DOM support (requires libxml = 2.4.14). - DIR is the libxml install directory.]) + DIR is the libxml install directory.], yes) if test -z $PHP_ZLIB_DIR; then PHP_ARG_WITH(zlib-dir, for the location of libz, Index: php-src/ext/simplexml/config.m4 diff -u php-src/ext/simplexml/config.m4:1.2 php-src/ext/simplexml/config.m4:1.3 --- php-src/ext/simplexml/config.m4:1.2 Tue May 20 04:46:55 2003 +++ php-src/ext/simplexml/config.m4 Wed Jun 25 16:53:52 2003 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.2 2003/05/20 08:46:55 derick Exp $ +dnl $Id: config.m4,v 1.3 2003/06/25 20:53:52 sterling Exp $ dnl config.m4 for extension simplexml PHP_ARG_WITH(simplexml, for simplexml support, -[ --with-simplexml Include simplexml support]) +[ --with-simplexml Include simplexml support], yes) if test $PHP_SIMPLEXML != no; then Index: php-src/ext/xml/config.m4 diff -u php-src/ext/xml/config.m4:1.45 php-src/ext/xml/config.m4:1.46 --- php-src/ext/xml/config.m4:1.45 Mon May 19 20:20:29 2003 +++ php-src/ext/xml/config.m4 Wed Jun 25 16:53:52 2003 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.45 2003/05/20 00:20:29 sniper Exp $ +dnl $Id: config.m4,v 1.46 2003/06/25 20:53:52 sterling Exp $ dnl PHP_ARG_ENABLE(xml,whether to enable XML support, -[ --disable-xml Disable XML support. Requires libxml2.], yes) +[ --disable-xml Disable XML support.], yes) PHP_ARG_WITH(libxml-dir, libxml install dir, [ --with-libxml-dir=DIR XML: libxml install prefix], no, no) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml EXPERIMENTAL config.m4
sterlingWed Jun 25 17:54:01 2003 EDT Removed files: /php-src/ext/simplexml EXPERIMENTAL Modified files: /php-src/ext/simplexml config.m4 Log: fine Index: php-src/ext/simplexml/config.m4 diff -u php-src/ext/simplexml/config.m4:1.4 php-src/ext/simplexml/config.m4:1.5 --- php-src/ext/simplexml/config.m4:1.4 Wed Jun 25 17:46:31 2003 +++ php-src/ext/simplexml/config.m4 Wed Jun 25 17:54:01 2003 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.4 2003/06/25 21:46:31 sniper Exp $ +dnl $Id: config.m4,v 1.5 2003/06/25 21:54:01 sterling Exp $ dnl config.m4 for extension simplexml PHP_ARG_WITH(simplexml, for simplexml support, -[ --with-simplexml Include simplexml support]) +[ --with-simplexml Include simplexml support], yes) if test $PHP_SIMPLEXML != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom config.m4
sterlingWed Jun 25 18:42:54 2003 EDT Modified files: /php-src/ext/domconfig.m4 Log: re-enable dom by default Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.8 php-src/ext/dom/config.m4:1.9 --- php-src/ext/dom/config.m4:1.8 Wed Jun 25 18:40:05 2003 +++ php-src/ext/dom/config.m4 Wed Jun 25 18:42:54 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2003/06/25 22:40:05 sniper Exp $ +dnl $Id: config.m4,v 1.9 2003/06/25 22:42:54 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -21,7 +21,7 @@ PHP_ARG_WITH(dom, for new DOM support, [ --with-dom[=DIR] Include new DOM support (requires libxml = 2.4.14). - DIR is the libxml install directory.]) + DIR is the libxml install directory.], yes) if test -z $PHP_ZLIB_DIR; then PHP_ARG_WITH(zlib-dir, for the location of libz, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
sterlingWed Jun 25 19:45:55 2003 EDT
Modified files:
/CVSROOTloginfo
Log:
send commits to curl to daniel for now
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.94 CVSROOT/loginfo:1.95
--- CVSROOT/loginfo:1.94Mon Jun 23 02:34:27 2003
+++ CVSROOT/loginfo Wed Jun 25 19:45:55 2003
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.94 2003/06/23 06:34:27 imajes Exp
$
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.95 2003/06/25 23:45:55 sterling
Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -89,6 +89,13 @@
# presentation-related stuff
^pres$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
^portal $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+
+^curl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^curl-www$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^curl-perl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^curl-java $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^curl-php$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^curl-cpp$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
# misc stuff
^jpgraph $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sterlingWed Jun 25 20:16:54 2003 EDT Modified files: /CVSROOTavail Log: grant ilia access to web and qa, as he is the (new) release manager for 4.3.3 Index: CVSROOT/avail diff -u CVSROOT/avail:1.699 CVSROOT/avail:1.700 --- CVSROOT/avail:1.699 Wed Jun 25 19:19:31 2003 +++ CVSROOT/avail Wed Jun 25 20:16:54 2003 @@ -31,7 +31,7 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # and master.php.net. -avail|cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,sniper,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web +avail|ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,sniper,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web # The PHP Presentation Group has access to the presentations on the # conf.php.net site. @@ -40,7 +40,7 @@ # The PHP Quality Assurance Team maintains their own website. -avail|jalal,zak,andre,lyric,jmoore,ronabop,sebastian,joey,sniper,torben,hellekin,cnewbill,bate,yohgaki,jan,imajes,derick,msopacua,nohn,edink|qaweb +avail|ilia,jalal,zak,andre,lyric,jmoore,ronabop,sebastian,joey,sniper,torben,hellekin,cnewbill,bate,yohgaki,jan,imajes,derick,msopacua,nohn,edink|qaweb # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP 4 tree, the PEAR website, and the PEAR documentation. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/math bug24142.phpt
sterlingWed Jun 25 23:21:45 2003 EDT Modified files: /php-src/ext/standard/tests/mathbug24142.phpt Log: according to the notes in the bugs database, this is the correct result. this result is also the same one given in 4.3.2 and 5.0 Index: php-src/ext/standard/tests/math/bug24142.phpt diff -u php-src/ext/standard/tests/math/bug24142.phpt:1.2 php-src/ext/standard/tests/math/bug24142.phpt:1.3 --- php-src/ext/standard/tests/math/bug24142.phpt:1.2 Mon Jun 16 15:59:27 2003 +++ php-src/ext/standard/tests/math/bug24142.phpt Wed Jun 25 23:21:45 2003 @@ -1,10 +1,10 @@ --TEST-- Bug #24142 (round() problems) --FILE-- -?php // $Id: bug24142.phpt,v 1.2 2003/06/16 19:59:27 sniper Exp $ vim600:syn=php +?php // $Id: bug24142.phpt,v 1.3 2003/06/26 03:21:45 sterling Exp $ vim600:syn=php echo round(5.045, 2). \n; echo round(5.055, 2). \n; ? --EXPECT-- +5.04 5.05 -5.06 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c var_unserializer.re
sterlingWed Jun 25 23:24:11 2003 EDT
Modified files:
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
fix by ilia to fix crashes in the session extension when /tmp/sess_* files
previously existed. make test now passes fully with the session extension.
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.25
php-src/ext/standard/var_unserializer.c:1.26
--- php-src/ext/standard/var_unserializer.c:1.25Tue Jun 10 16:03:39 2003
+++ php-src/ext/standard/var_unserializer.c Wed Jun 25 23:24:11 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Sat May 24 19:11:12 2003 */
-#line 1 /usr/src/php5/ext/standard/var_unserializer.re
+/* Generated by re2c 0.5 on Wed Jun 25 23:00:04 2003 */
+#line 1 /home/rei/PHP_CVS/php-src/ext/standard/var_unserializer.re
/*
+--+
| PHP Version 4|
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var_unserializer.c,v 1.25 2003/06/10 20:03:39 imajes Exp $ */
+/* $Id: var_unserializer.c,v 1.26 2003/06/26 03:24:11 sterling Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -339,7 +339,7 @@
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy74;
yy4:
-#line 441
+#line 440
{ return 0; }
yy5: yych = *++YYCURSOR;
if(yych == ';') goto yy72;
@@ -374,7 +374,7 @@
goto yy4;
yy13: yych = *++YYCURSOR;
yy14:
-#line 435
+#line 434
{
/* this is the case where we have less data than planned */
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of serialized
data);
@@ -398,7 +398,7 @@
if(yych != '') goto yy2;
yy21: yych = *++YYCURSOR;
yy22:
-#line 350
+#line 349
{
int len;
int elements;
@@ -505,7 +505,7 @@
if(yych != '') goto yy2;
yy28: yych = *++YYCURSOR;
yy29:
-#line 342
+#line 341
{
INIT_PZVAL(*rval);
@@ -535,7 +535,7 @@
if(yych != '{') goto yy2;
yy35: yych = *++YYCURSOR;
yy36:
-#line 324
+#line 323
{
int elements = parse_iv(start + 2);
@@ -575,7 +575,7 @@
if(yych != '') goto yy2;
yy42: yych = *++YYCURSOR;
yy43:
-#line 304
+#line 303
{
int len;
char *str;
@@ -652,7 +652,7 @@
}
yy51: yych = *++YYCURSOR;
yy52:
-#line 297
+#line 296
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -725,7 +725,7 @@
if(yych != ';') goto yy2;
yy64: yych = *++YYCURSOR;
yy65:
-#line 290
+#line 289
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -752,7 +752,7 @@
if(yych != ';') goto yy2;
yy70: yych = *++YYCURSOR;
yy71:
-#line 283
+#line 282
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -761,7 +761,7 @@
}
yy72: yych = *++YYCURSOR;
yy73:
-#line 276
+#line 275
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -800,7 +800,6 @@
return 0;
}
- zval_ptr_dtor(rval);
*rval = *rval_ref;
(*rval)-refcount++;
(*rval)-is_ref = 1;
@@ -808,7 +807,7 @@
return 1;
}
}
-#line 443
+#line 442
return 0;
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.17
php-src/ext/standard/var_unserializer.re:1.18
--- php-src/ext/standard/var_unserializer.re:1.17 Tue Jun 10 16:03:39 2003
+++ php-src/ext/standard/var_unserializer.reWed Jun 25 23:24:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: var_unserializer.re,v 1.17 2003/06/10 20:03:39 imajes Exp $ */
+/* $Id: var_unserializer.re,v 1.18 2003/06/26 03:24:11 sterling Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -265,7 +265,6 @@
return 0;
}
- zval_ptr_dtor(rval);
*rval = *rval_ref;
(*rval)-refcount++;
(*rval)-is_ref = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c
sterlingWed Jun 25 23:53:17 2003 EDT Modified files: /php-src/ext/standard var_unserializer.c Log: touch the file Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.26 php-src/ext/standard/var_unserializer.c:1.27 --- php-src/ext/standard/var_unserializer.c:1.26Wed Jun 25 23:24:11 2003 +++ php-src/ext/standard/var_unserializer.c Wed Jun 25 23:53:17 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: var_unserializer.c,v 1.26 2003/06/26 03:24:11 sterling Exp $ */ +/* $Id: var_unserializer.c,v 1.27 2003/06/26 03:53:17 sterling Exp $ */ #include php.h #include ext/standard/php_var.h @@ -112,7 +112,6 @@ #line 117 - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml compat.c
sterlingThu Jun 26 00:08:54 2003 EDT
Modified files:
/php-src/ext/xmlcompat.c
Log:
some friendly names...
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.14 php-src/ext/xml/compat.c:1.15
--- php-src/ext/xml/compat.c:1.14 Sun Jun 15 16:56:48 2003
+++ php-src/ext/xml/compat.cThu Jun 26 00:08:54 2003
@@ -403,16 +403,16 @@
}
const XML_Char *error_mapping[] = {
- NO ERROR,
- XML_ERROR_INTERNAL_ERROR,
- XML_NO_MEMORY,
+ No error,
+ Internal error,
+ No memory,
XML_ERR_DOCUMENT_START,
- XML_ERR_DOCUMENT_EMPTY,
+ Empty document,
XML_ERR_DOCUMENT_END,
- XML_ERR_INVALID_HEX_CHARREF,
- XML_ERR_INVALID_DEC_CHARREF,
- XML_ERR_INVALID_CHARREF,
- XML_ERR_INVALID_CHAR,
+ Invalid hexadecimal character reference,
+ Invalid decimal character reference,
+ Invalid character reference,
+ Invalid character,
XML_ERR_CHARREF_AT_EOF,
XML_ERR_CHARREF_IN_PROLOG,
XML_ERR_CHARREF_IN_EPILOG,
@@ -429,16 +429,16 @@
XML_ERR_ENTITYREF_SEMICOL_MISSING,
XML_ERR_PEREF_NO_NAME,
XML_ERR_PEREF_SEMICOL_MISSING,
- XML_ERR_UNDECLARED_ENTITY,
- XML_WAR_UNDECLARED_ENTITY,
- XML_ERR_UNPARSED_ENTITY,
+ Undeclared entity error,
+ Undeclared entity warning,
+ Unparsed Entity,
XML_ERR_ENTITY_IS_EXTERNAL,
XML_ERR_ENTITY_IS_PARAMETER,
- XML_ERR_UNKNOWN_ENCODING,
- XML_ERR_UNSUPPORTED_ENCODING,
+ Unknown encoding,
+ Unsupported encoding,
XML_ERR_STRING_NOT_STARTED,
XML_ERR_STRING_NOT_CLOSED,
- XML_ERR_NS_DECL_ERROR,
+ Namespace declaration error,
XML_ERR_ENTITY_NOT_STARTED,
XML_ERR_ENTITY_NOT_FINISHED,
XML_ERR_LT_IN_ATTRIBUTE,
@@ -485,7 +485,7 @@
XML_ERR_STANDALONE_VALUE,
XML_ERR_ENCODING_NAME,
XML_ERR_HYPHEN_IN_COMMENT,
- XML_ERR_INVALID_ENCODING,
+ Invalid encoding,
XML_ERR_EXT_ENTITY_STANDALONE,
XML_ERR_CONDSEC_INVALID,
XML_ERR_VALUE_REQUIRED,
@@ -495,7 +495,7 @@
XML_ERR_ENTITY_PE_INTERNAL,
XML_ERR_ENTITY_LOOP,
XML_ERR_ENTITY_BOUNDARY,
-XML_ERR_INVALID_URI,
+Invalid URI,
XML_ERR_URI_FRAGMENT,
XML_WAR_CATALOG_PI,
XML_ERR_NO_DTD
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5) /ext/sqlite config.m4
sterlingTue Jun 24 19:30:19 2003 EDT Modified files: (Branch: PHP_5) /php-src/ext/sqlite config.m4 Log: Enable sqlite by default Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.15 php-src/ext/sqlite/config.m4:1.15.4.1 --- php-src/ext/sqlite/config.m4:1.15 Fri Jun 6 18:44:56 2003 +++ php-src/ext/sqlite/config.m4Tue Jun 24 19:30:19 2003 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.15 2003/06/06 22:44:56 wez Exp $ +dnl $Id: config.m4,v 1.15.4.1 2003/06/24 23:30:19 sterling Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 PHP_ARG_WITH(sqlite, for sqlite support, -[ --with-sqlite Include sqlite support]) +[ --with-sqlite Include sqlite support], yes) if test $PHP_SQLITE != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5) /ext/dom config.m4
sterlingTue Jun 24 20:05:47 2003 EDT Modified files: (Branch: PHP_5) /php-src/ext/domconfig.m4 Log: --with-dom now that the old dom extension is in pecl Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.3 php-src/ext/dom/config.m4:1.3.2.1 --- php-src/ext/dom/config.m4:1.3 Sat Jun 14 09:35:09 2003 +++ php-src/ext/dom/config.m4 Tue Jun 24 20:05:47 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2003/06/14 13:35:09 helly Exp $ +dnl $Id: config.m4,v 1.3.2.1 2003/06/25 00:05:47 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -19,8 +19,8 @@ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom5, for new DOM support, -[ --with-dom5[=DIR] Include new DOM support (requires libxml = 2.4.14). +PHP_ARG_WITH(dom, for new DOM support, +[ --with-dom[=DIR] Include new DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) if test -z $PHP_ZLIB_DIR; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom config.m4
sterlingTue Jun 24 20:17:41 2003 EDT Modified files: /php-src/ext/domconfig.m4 Log: can now be --with-dom, as the old domxml is now in pecl Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.3 php-src/ext/dom/config.m4:1.4 --- php-src/ext/dom/config.m4:1.3 Sat Jun 14 09:35:09 2003 +++ php-src/ext/dom/config.m4 Tue Jun 24 20:17:41 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2003/06/14 13:35:09 helly Exp $ +dnl $Id: config.m4,v 1.4 2003/06/25 00:17:41 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -19,8 +19,8 @@ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom5, for new DOM support, -[ --with-dom5[=DIR] Include new DOM support (requires libxml = 2.4.14). +PHP_ARG_WITH(dom, for new DOM support, +[ --with-dom[=DIR] Include new DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) if test -z $PHP_ZLIB_DIR; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite config.m4
sterlingTue Jun 24 20:18:01 2003 EDT Modified files: /php-src/ext/sqlite config.m4 Log: enable sqlite by default Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.15 php-src/ext/sqlite/config.m4:1.16 --- php-src/ext/sqlite/config.m4:1.15 Fri Jun 6 18:44:56 2003 +++ php-src/ext/sqlite/config.m4Tue Jun 24 20:18:01 2003 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.15 2003/06/06 22:44:56 wez Exp $ +dnl $Id: config.m4,v 1.16 2003/06/25 00:18:01 sterling Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 PHP_ARG_WITH(sqlite, for sqlite support, -[ --with-sqlite Include sqlite support]) +[ --with-sqlite Include sqlite support], yes) if test $PHP_SQLITE != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/rpc .cvsignore CREDITS EXPERIMENTAL RPC_HOWTO handler.h hash.h php_rpc.h rpc.c rpc.h rpc_proxy.c rpc_proxy.h /ext/rpc/com .cvsignore CREDITS TODO com.c com.dsp com.h com_wrapper.c com_wrapper.h conversion.c conversion.h dispatch.c php_com.h variant.c variant.h /ext/rpc/dotnet .cvsignore CREDITS EXPERIMENTAL README dotnet.cpp dotnet.dsp dotnet.php php_dotnet.h /ext/rpc/java .cvsignore CREDITS EXPERIMENTAL Makefile.frag README config.m4 except.php java.c java.dsp jawt.php jver.php reflect.java /ext/rpc/skeleton php_skeleton.h skeleton.c skeleton.h /ext/rpc/tests test1.php test2.php test3.php test4.php tests.php /ext/rpc/xmlrpc .cvsignore CREDITS EXPERIMENTAL config.m4 php_xmlrpc.h xmlrpc-epi-php.c xmlrpc.dsp /ext/rpc/xmlrpc/libxmlrpc .cvsignore README acinclude.m4 base64.c base64.h encodings.c encodings.h queue.c queue.h simplestring.c simplestring.h system_methods.c system_methods_private.h xml_element.c xml_element.h xml_to_dandarpc.c xml_to_dandarpc.h xml_to_soap.c xml_to_soap.h xml_to_xmlrpc.c xml_to_xmlrpc.h xmlrpc.c xmlrpc.h xmlrpc.m4 xmlrpc_introspection.c xmlrpc_introspection.h xmlrpc_introspection_private.h xmlrpc_private.h xmlrpc_win32.h
sterlingTue Jun 24 20:28:10 2003 EDT Removed files: /php-src/ext/rpc.cvsignore CREDITS EXPERIMENTAL RPC_HOWTO handler.h hash.h php_rpc.h rpc.c rpc.h rpc_proxy.c rpc_proxy.h /php-src/ext/rpc/com.cvsignore CREDITS TODO com.c com.dsp com.h com_wrapper.c com_wrapper.h conversion.c conversion.h dispatch.c php_com.h variant.c variant.h /php-src/ext/rpc/dotnet .cvsignore CREDITS EXPERIMENTAL README dotnet.cpp dotnet.dsp dotnet.php php_dotnet.h /php-src/ext/rpc/java .cvsignore CREDITS EXPERIMENTAL Makefile.frag README config.m4 except.php java.c java.dsp jawt.php jver.php reflect.java /php-src/ext/rpc/skeleton php_skeleton.h skeleton.c skeleton.h /php-src/ext/rpc/tests test1.php test2.php test3.php test4.php tests.php /php-src/ext/rpc/xmlrpc .cvsignore CREDITS EXPERIMENTAL config.m4 php_xmlrpc.h xmlrpc-epi-php.c xmlrpc.dsp /php-src/ext/rpc/xmlrpc/libxmlrpc .cvsignore README acinclude.m4 base64.c base64.h encodings.c encodings.h queue.c queue.h simplestring.c simplestring.h system_methods.c system_methods_private.h xml_element.c xml_element.h xml_to_dandarpc.c xml_to_dandarpc.h xml_to_soap.c xml_to_soap.h xml_to_xmlrpc.c xml_to_xmlrpc.h xmlrpc.c xmlrpc.h xmlrpc.m4 xmlrpc_introspection.c xmlrpc_introspection.h xmlrpc_introspection_private.h xmlrpc_private.h xmlrpc_win32.h Log: moved to pecl by sascha. remove them from head. discussed with harald, will remain in pecl till he has some more time to work on it. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sterlingTue Jun 24 20:32:11 2003 EDT Modified files: /php-srcNEWS Log: add some NEWS stuff. Add your stuff now! Index: php-src/NEWS diff -u php-src/NEWS:1.1426 php-src/NEWS:1.1427 --- php-src/NEWS:1.1426 Mon Jun 16 15:58:24 2003 +++ php-src/NEWSTue Jun 24 20:32:11 2003 @@ -2,12 +2,25 @@ ||| ? ? ??? 200?, Version 5.0.0 -## Note the changed grouping. Try add your entries to appropriate places -## to enhance the readability of this file. Using @ is discouraged. -## (This file will be cleaned up before release.) +? ? ??? 2003, PHP 5 Beta 1 -- Moved extensions to PECL (http://pear.php.net/): (James, Tal) - . ext/fribidi +- The SQLite (http://www.hwaci.com/sw/sqlite/) extension is now bundled and + enabled by default. (Wez, Marcus, Tal) + +- Improved the speed of internal functions that use callbacks by 40% due to a + new internal fast_call_user_function() function. (Sterling) + +- Completely Overhauled XML support + . Brand new simplexml extension (Sterling) + . New DOM extension (Rob, Chregu, Marcus) + . New XSL extension (Chregu, Rob) + . Moved the old DOM-XML and XSLT extensions to PECL (James, Sterling) + . ext/xml can now use both libxml2 and expat to parse XML (Sterling) + . Removed bundled expat (Jani) + +- Due to a license change, we are longer bundling the MySQL client library. + If you previously relied on this library in your own product, make sure to + check with MySQL AB for the new licensing terms. (Sterling) - New php.ini options: . session.hash_function and session.hash_bits_per_character. (Sascha) @@ -86,7 +99,6 @@ (Ilia) - Added optional parameter to file() which makes the result array not contain the line endings and to skip empty lines. (Ilia) - - Added new range() functionality: (Ilia) . Support for float modifier. . Detection of numeric values inside strings passed as high low. @@ -100,7 +112,6 @@ - Added context options 'method', 'header' and 'content' for http://; fopen wrapper. (Sara) - Added input filter support. See README.input_filter for more info. (Rasmus) - - Fixed is_executable() to be available also on Windows. (Shane) - Fixed dirname() and strip_tags() to be binary-safe. (Moriyoshi) - Fixed bug #24098 (crash in pathinfo()). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sterlingWed Jun 25 00:39:01 2003 EDT Modified files: /php-srcNEWS Log: add zend engine 2 changes. Index: php-src/NEWS diff -u php-src/NEWS:1.1428 php-src/NEWS:1.1429 --- php-src/NEWS:1.1428 Tue Jun 24 20:56:29 2003 +++ php-src/NEWSWed Jun 25 00:39:00 2003 @@ -4,6 +4,10 @@ ? ? ??? 2003, PHP 5 Beta 1 +- Switch to using Zend Engine 2, which includes numerous engine level + improvements. A full list is available at + http://www.php.net/zend-engine-2.php. + - The SQLite (http://www.hwaci.com/sw/sqlite/) extension is now bundled and enabled by default. (Wez, Marcus, Tal) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sterlingWed Jun 25 01:28:22 2003 EDT Modified files: /CVSROOTavail Log: give alan k access to php5, pecl Index: CVSROOT/avail diff -u CVSROOT/avail:1.696 CVSROOT/avail:1.697 --- CVSROOT/avail:1.696 Mon Jun 23 23:40:16 2003 +++ CVSROOT/avail Wed Jun 25 01:28:21 2003 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el # People who work on the Engine -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / modules
sterlingSun Jun 22 20:29:01 2003 EDT Modified files: /CVSROOTmodules Log: make it a cvs link Index: CVSROOT/modules diff -u CVSROOT/modules:1.43 CVSROOT/modules:1.44 --- CVSROOT/modules:1.43Sun Jun 22 20:26:13 2003 +++ CVSROOT/modules Sun Jun 22 20:29:00 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident @(#)cvs/examples:$Name: $:$Id: modules,v 1.43 2003/06/23 00:26:13 imajes Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: modules,v 1.44 2003/06/23 00:29:00 sterling Exp $ # # Three different line formats are valid: # key -aaliases... @@ -41,7 +41,7 @@ mono-ext -d ext/mono pecl/mono sqlite-ext -d ext/sqlite pecl/sqlite simplexml-ext -d ext/simplexml pecl/simplexml -php5 php5 ze2-dir TSRM bz2-ext mono-ext sqlite-ext simplexml-ext +php5 php5 ze2-dir TSRM bz2-ext mono-ext sqlite-ext simplexml-ext #php3 php3 phpweb phpweb pear pear -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php5 /ext/mysql config.m4 /ext/mysql/libmysql .cvsignore acinclude.m4 array.c bchange.c bmove.c bmove_upp.c charset.c config-win.h ctype.c ctype_autoconf.c ctype_extra_sources.c dbug.c dbug.h default.c dll.c errmsg.c errmsg.h errors.c fix_copyright get_password.c global.h int2str.c is_prefix.c libmysql.c libmysql.dsp list.c longlong2str.c m_ctype.h m_string.h mf_casecnv.c mf_dirname.c mf_fn_ext.c mf_format.c mf_loadpath.c mf_pack.c mf_path.c mf_unixpath.c mf_wcomp.c mulalloc.c my_alarm.h my_alloc.c my_compress.c my_config.h my_create.c my_delete.c my_dir.h my_div.c my_error.c my_fopen.c my_getwd.c my_init.c my_lib.c my_list.h my_malloc.c my_messnc.c my_net.c my_net.h my_once.c my_open.c my_pthread.c my_pthread.h my_read.c my_realloc.c my_static.c my_static.h my_sys.h my_tempnam.c my_thr_init.c my_wincond.c my_winthread.c my_write.c mysql.h mysql.m4 mysql_com.h mysql_version.h mysqld_error.h mysys_err.h mysys_priv.h net.c password.c raid.h safemalloc.c stamp-h.in str2int.c strcend.c strcont.c strend.c strfill.c string.c strinstr.c strmake.c strmov.c strnmov.c strto.c strtoll.c strtoull.c strxmov.c thr_alarm.h thr_mutex.c typelib.c update_sources violite.c violite.h
sterlingSun Jun 22 21:10:59 2003 EDT Removed files: /php5/ext/mysql/libmysql.cvsignore acinclude.m4 array.c bchange.c bmove.c bmove_upp.c charset.c config-win.h ctype.c ctype_autoconf.c ctype_extra_sources.c dbug.c dbug.h default.c dll.c errmsg.c errmsg.h errors.c fix_copyright get_password.c global.h int2str.c is_prefix.c libmysql.c libmysql.dsp list.c longlong2str.c m_ctype.h m_string.h mf_casecnv.c mf_dirname.c mf_fn_ext.c mf_format.c mf_loadpath.c mf_pack.c mf_path.c mf_unixpath.c mf_wcomp.c mulalloc.c my_alarm.h my_alloc.c my_compress.c my_config.h my_create.c my_delete.c my_dir.h my_div.c my_error.c my_fopen.c my_getwd.c my_init.c my_lib.c my_list.h my_malloc.c my_messnc.c my_net.c my_net.h my_once.c my_open.c my_pthread.c my_pthread.h my_read.c my_realloc.c my_static.c my_static.h my_sys.h my_tempnam.c my_thr_init.c my_wincond.c my_winthread.c my_write.c mysql.h mysql.m4 mysql_com.h mysql_version.h mysqld_error.h mysys_err.h mysys_priv.h net.c password.c raid.h safemalloc.c stamp-h.in str2int.c strcend.c strcont.c strend.c strfill.c string.c strinstr.c strmake.c strmov.c strnmov.c strto.c strtoll.c strtoull.c strxmov.c thr_alarm.h thr_mutex.c typelib.c update_sources violite.c violite.h Modified files: /php5/ext/mysql config.m4 Log: remove the bundled libmysql, and update the config.m4 file as necessary. this works locally, but everyone, *please* test Index: php5/ext/mysql/config.m4 diff -u php5/ext/mysql/config.m4:1.55 php5/ext/mysql/config.m4:1.56 --- php5/ext/mysql/config.m4:1.55 Tue Jan 7 04:49:08 2003 +++ php5/ext/mysql/config.m4Sun Jun 22 21:10:58 2003 @@ -1,12 +1,7 @@ dnl -dnl $Id: config.m4,v 1.55 2003/01/07 09:49:08 sas Exp $ +dnl $Id: config.m4,v 1.56 2003/06/23 01:10:58 sterling Exp $ dnl -sinclude(ext/mysql/libmysql/acinclude.m4) -sinclude(ext/mysql/libmysql/mysql.m4) -sinclude(libmysql/acinclude.m4) -sinclude(libmysql/mysql.m4) - AC_DEFUN(MYSQL_LIB_CHK, [ str=$MYSQL_DIR/$1/libmysqlclient.* for j in `echo $str`; do @@ -45,7 +40,7 @@ PHP_ARG_WITH(mysql, for MySQL support, [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. - If unspecified, the bundled MySQL library will be used.], yes) + If unspecified, the bundled MySQL library will be used.]) PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket, [ --with-mysql-sock[=DIR] MySQL: Location of the MySQL unix socket pointer. @@ -72,32 +67,8 @@ fi fi -if test $PHP_MYSQL = yes; then - MYSQL_MODULE_TYPE=builtin - MYSQL_CHECKS - sources=libmysql/libmysql.c libmysql/errmsg.c libmysql/net.c libmysql/violite.c libmysql/password.c \ - libmysql/my_init.c libmysql/my_lib.c libmysql/my_static.c libmysql/my_malloc.c libmysql/my_realloc.c libmysql/my_create.c \ - libmysql/my_delete.c libmysql/my_tempnam.c libmysql/my_open.c libmysql/mf_casecnv.c libmysql/my_read.c \ - libmysql/my_write.c libmysql/errors.c libmysql/my_error.c libmysql/my_getwd.c libmysql/my_div.c libmysql/mf_pack.c \ - libmysql/my_messnc.c libmysql/mf_dirname.c libmysql/mf_fn_ext.c libmysql/mf_wcomp.c libmysql/typelib.c libmysql/safemalloc.c \ - libmysql/my_alloc.c libmysql/mf_format.c libmysql/mf_path.c libmysql/mf_unixpath.c libmysql/my_fopen.c libmysql/mf_loadpath.c \ - libmysql/my_pthread.c libmysql/my_thr_init.c libmysql/thr_mutex.c libmysql/mulalloc.c libmysql/string.c libmysql/default.c \ - libmysql/my_compress.c libmysql/array.c libmysql/my_once.c libmysql/list.c libmysql/my_net.c libmysql/dbug.c \ - libmysql/strmov.c libmysql/strxmov.c libmysql/strnmov.c libmysql/strmake.c libmysql/strend.c libmysql/strfill.c \ - libmysql/is_prefix.c libmysql/int2str.c libmysql/str2int.c libmysql/strinstr.c \ - libmysql/strcont.c libmysql/strcend.c libmysql/bchange.c libmysql/bmove.c libmysql/bmove_upp.c \ -
Re: [PHP-CVS] cvs: php4 /ext/sockets config.m4
On Thu, 2003-06-19 at 02:27, Wez Furlong wrote: I don't like it being enabled by default either, since it is experimental, unstable and broken. (and streams provides stream_socket_server() and stream_socket_client() as replacements for the most common uses of ext/sockets). Well, I dare say its less experimental than streams. Sockets has been in production use for quite awhile now, the EXPERIMENTAL is just lying around there. streams provides a reasonable abstraction, but it doesn't provide the low-level access that is a pretty common requirement. Sockets provides this without requiring anything extra, so why not use it? As for security implications, it was related to socket timeouts, which are readily available with streams anyhow. So that's not an issue either. -Sterling -- People can have the Model T in any colour -- so long as it's black. - Henry Ford -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/curl interface.c
sterlingWed Jun 18 17:02:02 2003 EDT Modified files: /php4/ext/curl interface.c Log: recognize CURLOPT_PORT Index: php4/ext/curl/interface.c diff -u php4/ext/curl/interface.c:1.20 php4/ext/curl/interface.c:1.21 --- php4/ext/curl/interface.c:1.20 Thu Jun 12 08:32:22 2003 +++ php4/ext/curl/interface.c Wed Jun 18 17:02:02 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.20 2003/06/12 12:32:22 andrey Exp $ */ +/* $Id: interface.c,v 1.21 2003/06/18 21:02:02 sterling Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -773,6 +773,7 @@ case CURLOPT_HTTPGET: case CURLOPT_HTTP_VERSION: case CURLOPT_CRLF: + case CURLOPT_PORT: convert_to_long_ex(zvalue); error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/sockets config.m4
sterlingThu Jun 19 00:39:43 2003 EDT Modified files: /php4/ext/sockets config.m4 Log: enable sockets by default. Index: php4/ext/sockets/config.m4 diff -u php4/ext/sockets/config.m4:1.12 php4/ext/sockets/config.m4:1.13 --- php4/ext/sockets/config.m4:1.12 Fri Apr 4 10:42:54 2003 +++ php4/ext/sockets/config.m4 Thu Jun 19 00:39:42 2003 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.12 2003/04/04 15:42:54 sniper Exp $ +dnl $Id: config.m4,v 1.13 2003/06/19 04:39:42 sterling Exp $ dnl PHP_ARG_ENABLE(sockets, whether to enable sockets support, -[ --enable-socketsEnable sockets support]) +[ --enable-socketsEnable sockets support], yes) if test $PHP_SOCKETS != no; then dnl Check for struct cmsghdr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mysqli mysqli_profiler.h
sterlingMon Jun 16 20:49:24 2003 EDT Modified files: /php4/ext/mysqlimysqli_profiler.h Log: remove the wierdness that prevented the compileness Index: php4/ext/mysqli/mysqli_profiler.h diff -u php4/ext/mysqli/mysqli_profiler.h:1.3 php4/ext/mysqli/mysqli_profiler.h:1.4 --- php4/ext/mysqli/mysqli_profiler.h:1.3 Tue Jun 10 16:03:33 2003 +++ php4/ext/mysqli/mysqli_profiler.h Mon Jun 16 20:49:24 2003 @@ -137,8 +137,8 @@ #define MYSQLI_PR_RESULT 6 /*** PROFILER MACROS ***/ -#define MYSQLI_PROFILER_STARTTIME(ptr) gettimeofday(ptr##-header.starttime, NULL) -#define MYSQLI_PROFILER_ELAPSEDTIME(ptr) php_mysqli_profiler_timediff(ptr##-header.starttime, ptr##-header.elapsedtime) +#define MYSQLI_PROFILER_STARTTIME(ptr) gettimeofday(ptr-header.starttime, NULL) +#define MYSQLI_PROFILER_ELAPSEDTIME(ptr) php_mysqli_profiler_timediff(ptr-header.starttime, ptr-header.elapsedtime) #define MYSQLI_PROFILER_LIFETIME(ptr) php_mysqli_profiler_timediff((ptr)-starttime, (ptr)-lifetime) #define MYSQLI_PROFILER_NEW(parent, type, time) php_mysqli_profiler_new_object((PR_COMMON *)parent, type, time) #define MYSQLI_PROFILER_COMMAND_START(cmd,parent)\ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
