[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
sniper Fri Sep 2 17:13:21 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
Log:
reorder
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.49&r2=1.2027.2.50&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.49 php-src/NEWS:1.2027.2.50
--- php-src/NEWS:1.2027.2.49Fri Sep 2 17:13:00 2005
+++ php-src/NEWSFri Sep 2 17:13:20 2005
@@ -21,11 +21,10 @@
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
-- Fixed bug #34307 (on_modify handler not called to set the default value if
- setting from php.ini was invalid). (Andrei)
- Fixed bug #34331 (php crashes when variables_order is empty). (Ilia)
- Fixed bug #34310 (foreach($arr as $c->d => $x) crashes). (Dmitry)
-- Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty). (Jani)
+- Fixed bug #34307 (on_modify handler not called to set the default value if
+ setting from php.ini was invalid). (Andrei)
- Fixed bug #34306 (wddx_serialize_value() crashes with long array keys).
(Jani)
- Fixed bug #34304 (date() doesn't have a modifier for ISO Week Day). (Derick)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
sniper Fri Sep 2 17:13:01 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.48&r2=1.2027.2.49&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.48 php-src/NEWS:1.2027.2.49 --- php-src/NEWS:1.2027.2.48Fri Sep 2 05:33:05 2005 +++ php-src/NEWSFri Sep 2 17:13:00 2005 @@ -21,6 +21,8 @@ - Fixed "make test" to work for phpized extensions. (Hartmut, Jani) - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems. (Andrey) +- Fixed bug #34307 (on_modify handler not called to set the default value if + setting from php.ini was invalid). (Andrei) - Fixed bug #34331 (php crashes when variables_order is empty). (Ilia) - Fixed bug #34310 (foreach($arr as $c->d => $x) crashes). (Dmitry) - Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
sniper Fri Sep 2 17:12:32 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
Log:
typo
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.34&r2=1.1247.2.920.2.35&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.34 php-src/NEWS:1.1247.2.920.2.35
--- php-src/NEWS:1.1247.2.920.2.34 Fri Sep 2 17:11:11 2005
+++ php-src/NEWSFri Sep 2 17:12:31 2005
@@ -2,7 +2,7 @@
|||
?? ??? 2005, Version 4.4.1
- Fixed bug #34307 (on_modify handler not called to set the default value if
- case setting from php.ini was invalid). (Andrei)
+ setting from php.ini was invalid). (Andrei)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)
- Fixed bug #34277 (array_filter() crashes with references and objects).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
sniper Fri Sep 2 17:12:10 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
Log:
BFN
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.473&r2=1.1760.2.474&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.473 php-src/NEWS:1.1760.2.474
--- php-src/NEWS:1.1760.2.473 Fri Sep 2 03:46:38 2005
+++ php-src/NEWSFri Sep 2 17:12:09 2005
@@ -21,6 +21,8 @@
- Fixed segfaults when CURL callback functions throw exception. (Tony)
- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and
#33295. (Mike Bretz)
+- Fixed bug #34307 (on_modify handler not called to set the default value if
+ setting from php.ini was invalid). (Andrei)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)
- Fixed bug #34299 (ReflectionClass::isInstantiable() returns true for abstract
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
sniper Fri Sep 2 17:11:13 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
Log:
BFN
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.33&r2=1.1247.2.920.2.34&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.33 php-src/NEWS:1.1247.2.920.2.34
--- php-src/NEWS:1.1247.2.920.2.33 Thu Sep 1 09:26:44 2005
+++ php-src/NEWSFri Sep 2 17:11:11 2005
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||
?? ??? 2005, Version 4.4.1
+- Fixed bug #34307 (on_modify handler not called to set the default value if
+ case setting from php.ini was invalid). (Andrei)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)
- Fixed bug #34277 (array_filter() crashes with references and objects).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/internal splobjectstorage.inc
helly Fri Sep 2 15:16:43 2005 EDT Modified files: /php-src/ext/spl/internal splobjectstorage.inc Log: - Fix docu http://cvs.php.net/diff.php/php-src/ext/spl/internal/splobjectstorage.inc?r1=1.1&r2=1.2&ty=u Index: php-src/ext/spl/internal/splobjectstorage.inc diff -u php-src/ext/spl/internal/splobjectstorage.inc:1.1 php-src/ext/spl/internal/splobjectstorage.inc:1.2 --- php-src/ext/spl/internal/splobjectstorage.inc:1.1 Wed Aug 10 17:56:01 2005 +++ php-src/ext/spl/internal/splobjectstorage.inc Fri Sep 2 15:16:43 2005 @@ -68,7 +68,7 @@ return count($this->storage); } - /** @obj object to look for + /** @param obj object to look for * @return whether $obj is contained in storage */ function contains($obj) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/examples recursivefilteriterator.inc /ext/spl/internal recursivefilteriterator.inc
helly Fri Sep 2 15:15:31 2005 EDT
Removed files:
/php-src/ext/spl/examples recursivefilteriterator.inc
Modified files:
/php-src/ext/spl/internal recursivefilteriterator.inc
Log:
- Update docu
http://cvs.php.net/diff.php/php-src/ext/spl/internal/recursivefilteriterator.inc?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/internal/recursivefilteriterator.inc
diff -u php-src/ext/spl/internal/recursivefilteriterator.inc:1.1
php-src/ext/spl/internal/recursivefilteriterator.inc:1.2
--- php-src/ext/spl/internal/recursivefilteriterator.inc:1.1Wed Aug 10
15:48:48 2005
+++ php-src/ext/spl/internal/recursivefilteriterator.incFri Sep 2
15:15:30 2005
@@ -1,32 +1,39 @@
ref = new ReflectionClass($this);
parent::__construct($it);
}
@@ -34,15 +41,17 @@
*/
function hasChildren()
{
- return $this->it->hasChildren();
+ return $this->getInnerIterator()->hasChildren();
}
/** @return the ParentIterator for the current elements children
*/
function getChildren()
{
- return new RecursiveFilterIterator($this->it->getChildren());
+ return
$this->ref->newInstance($this->getInnerIterator()->getChildren());
}
+
+ private $ref;
}
?>
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl.php
helly Fri Sep 2 15:11:11 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/splspl.php Log: - MFH Update docu http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.49&r2=1.49.2.1&ty=u Index: php-src/ext/spl/spl.php diff -u php-src/ext/spl/spl.php:1.49 php-src/ext/spl/spl.php:1.49.2.1 --- php-src/ext/spl/spl.php:1.49Wed May 4 15:14:08 2005 +++ php-src/ext/spl/spl.php Fri Sep 2 15:11:10 2005 @@ -495,6 +495,7 @@ /** @ingroup SPL * @brief An Array wrapper * @since PHP 5.0 + * @version 1.1 * * This array wrapper allows to recursively iterate over Arrays and public * Object properties. @@ -507,8 +508,28 @@ * That is any Array or Object. * * @param $array the array to use. +* @param $flags see setFlags(). */ - function __construct($array); + function __construct($array, $flags = 0); + + /** Set behavior flags. +* +* @param $flags bitmask as follows: +*0 set: properties of the object have their normal functionality +* when accessed as list (var_dump, foreach, etc.) +*1 set: array indices can be accessed as properties in read/write +*/ + function setFlags($flags); + + /** +* @ return current flags +*/ + function getFlags(); + + /** +* @param $array new array or object +*/ + function exchangeArray($array); /** @return the iterator which is an ArrayIterator object connected to * this object. @@ -555,6 +576,7 @@ /** @ingroup SPL * @brief An Array iterator * @since PHP 5.0 + * @version 1.1 * * This iterator allows to unset and modify values and keys while iterating * over Arrays and Objects. @@ -570,8 +592,23 @@ * That is any Array or Object. * * @param $array the array to use. +* @param $flags see setFlags(). +*/ + function __construct($array, $flags = 0); + + /** Set behavior flags. +* +* @param $flags bitmask as follows: +*0 set: properties of the object have their normal functionality +* when accessed as list (var_dump, foreach, etc.) +*1 set: array indices can be accessed as properties in read/write +*/ + function setFlags($flags); + + /** +* @ return current flags */ - public function __construct($array); + function getFlags(); /** @param $index offset to inspect * @return whetehr offset $index esists -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl.php
helly Fri Sep 2 15:10:53 2005 EDT Modified files: /php-src/ext/splspl.php Log: - Update docu http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.49&r2=1.50&ty=u Index: php-src/ext/spl/spl.php diff -u php-src/ext/spl/spl.php:1.49 php-src/ext/spl/spl.php:1.50 --- php-src/ext/spl/spl.php:1.49Wed May 4 15:14:08 2005 +++ php-src/ext/spl/spl.php Fri Sep 2 15:10:51 2005 @@ -495,6 +495,7 @@ /** @ingroup SPL * @brief An Array wrapper * @since PHP 5.0 + * @version 1.1 * * This array wrapper allows to recursively iterate over Arrays and public * Object properties. @@ -507,8 +508,28 @@ * That is any Array or Object. * * @param $array the array to use. +* @param $flags see setFlags(). */ - function __construct($array); + function __construct($array, $flags = 0); + + /** Set behavior flags. +* +* @param $flags bitmask as follows: +*0 set: properties of the object have their normal functionality +* when accessed as list (var_dump, foreach, etc.) +*1 set: array indices can be accessed as properties in read/write +*/ + function setFlags($flags); + + /** +* @ return current flags +*/ + function getFlags(); + + /** +* @param $array new array or object +*/ + function exchangeArray($array); /** @return the iterator which is an ArrayIterator object connected to * this object. @@ -555,6 +576,7 @@ /** @ingroup SPL * @brief An Array iterator * @since PHP 5.0 + * @version 1.1 * * This iterator allows to unset and modify values and keys while iterating * over Arrays and Objects. @@ -570,8 +592,23 @@ * That is any Array or Object. * * @param $array the array to use. +* @param $flags see setFlags(). +*/ + function __construct($array, $flags = 0); + + /** Set behavior flags. +* +* @param $flags bitmask as follows: +*0 set: properties of the object have their normal functionality +* when accessed as list (var_dump, foreach, etc.) +*1 set: array indices can be accessed as properties in read/write +*/ + function setFlags($flags); + + /** +* @ return current flags */ - public function __construct($array); + function getFlags(); /** @param $index offset to inspect * @return whetehr offset $index esists -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/zlib zlib.c
iliaa Fri Sep 2 13:25:33 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/zlib zlib.c
Log:
MFH: Resolved bug #34240.
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib.c?r1=1.153.2.16.4.1&r2=1.153.2.16.4.2&ty=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.153.2.16.4.1
php-src/ext/zlib/zlib.c:1.153.2.16.4.2
--- php-src/ext/zlib/zlib.c:1.153.2.16.4.1 Sun Aug 21 12:05:35 2005
+++ php-src/ext/zlib/zlib.c Fri Sep 2 13:25:33 2005
@@ -18,7 +18,7 @@
| Jade Nicoletti <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: zlib.c,v 1.153.2.16.4.1 2005/08/21 16:05:35 iliaa Exp $ */
+/* $Id: zlib.c,v 1.153.2.16.4.2 2005/09/02 17:25:33 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -717,7 +717,7 @@
if (do_end) {
err = deflate(&ZLIBG(stream), Z_FINISH);
- buffer[outlen - ZLIBG(stream).avail_out] = '\0';
+ buffer[outlen + start_offset - ZLIBG(stream).avail_out] = '\0';
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/zlib zlib.c
iliaa Fri Sep 2 13:25:22 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/zlib zlib.c
Log:
MFh: Resolved bug #34240.
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib.c?r1=1.181.2.1&r2=1.181.2.2&ty=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.181.2.1 php-src/ext/zlib/zlib.c:1.181.2.2
--- php-src/ext/zlib/zlib.c:1.181.2.1 Sun Aug 21 12:04:38 2005
+++ php-src/ext/zlib/zlib.c Fri Sep 2 13:25:22 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.181.2.1 2005/08/21 16:04:38 iliaa Exp $ */
+/* $Id: zlib.c,v 1.181.2.2 2005/09/02 17:25:22 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -640,7 +640,7 @@
if (do_end) {
err = deflate(&ZLIBG(stream), Z_FINISH);
- buffer[outlen - ZLIBG(stream).avail_out] = '\0';
+ buffer[outlen + start_offset - ZLIBG(stream).avail_out] = '\0';
}
*p_buffer = buffer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/zlib zlib.c
iliaa Fri Sep 2 13:25:16 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/zlib zlib.c
Log:
MFH: Resolved bug #34240.
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib.c?r1=1.183.2.1&r2=1.183.2.2&ty=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.1 php-src/ext/zlib/zlib.c:1.183.2.2
--- php-src/ext/zlib/zlib.c:1.183.2.1 Sun Aug 21 12:03:21 2005
+++ php-src/ext/zlib/zlib.c Fri Sep 2 13:25:16 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.183.2.1 2005/08/21 16:03:21 iliaa Exp $ */
+/* $Id: zlib.c,v 1.183.2.2 2005/09/02 17:25:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -644,7 +644,7 @@
if (do_end) {
err = deflate(&ZLIBG(stream), Z_FINISH);
- buffer[outlen - ZLIBG(stream).avail_out] = '\0';
+ buffer[outlen + start_offset - ZLIBG(stream).avail_out] = '\0';
}
*p_buffer = buffer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib zlib.c
iliaa Fri Sep 2 13:25:10 2005 EDT
Modified files:
/php-src/ext/zlib zlib.c
Log:
Resolved bug #34240.
# Thanks to xuefer at 21cn dot com for providing it.
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib.c?r1=1.184&r2=1.185&ty=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.184 php-src/ext/zlib/zlib.c:1.185
--- php-src/ext/zlib/zlib.c:1.184 Sun Aug 21 12:02:25 2005
+++ php-src/ext/zlib/zlib.c Fri Sep 2 13:25:10 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.184 2005/08/21 16:02:25 iliaa Exp $ */
+/* $Id: zlib.c,v 1.185 2005/09/02 17:25:10 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -644,7 +644,7 @@
if (do_end) {
err = deflate(&ZLIBG(stream), Z_FINISH);
- buffer[outlen - ZLIBG(stream).avail_out] = '\0';
+ buffer[outlen + start_offset - ZLIBG(stream).avail_out] = '\0';
}
*p_buffer = buffer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c
rrichards Fri Sep 2 11:38:23 2005 EDT
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
Fix crash: handler name not length needs to be passed to php_error_docref
http://cvs.php.net/diff.php/php-src/ext/xsl/xsltprocessor.c?r1=1.42&r2=1.43&ty=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.42
php-src/ext/xsl/xsltprocessor.c:1.43
--- php-src/ext/xsl/xsltprocessor.c:1.42Fri Sep 2 02:37:29 2005
+++ php-src/ext/xsl/xsltprocessor.c Fri Sep 2 11:38:22 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.42 2005/09/02 06:37:29 rrichards Exp $ */
+/* $Id: xsltprocessor.c,v 1.43 2005/09/02 15:38:22 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -268,7 +268,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call
handler %R()", Z_TYPE(callable), Z_UNIVAL(callable));
} else if ( intern->registerPhpFunctions == 2 &&
zend_u_hash_exists(intern->registered_phpfunctions, Z_TYPE(callable),
Z_UNIVAL(callable), Z_UNILEN(callable) + 1) == 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not allowed to
call handler '%R()'.", Z_TYPE(callable), Z_UNILEN(callable));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not allowed to
call handler '%R()'.", Z_TYPE(callable), Z_UNIVAL(callable));
// Push an empty string, so that we at least have an xslt
result...
valuePush(ctxt, xmlXPathNewString(""));
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date php_date.c php_date.h
derick Fri Sep 2 10:58:01 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/date php_date.c php_date.h
Log:
- MFH: Added date_time_set, date_date_set and date_isodate_set() functions,
and
setTime, setDate and setISODate() methods.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.4&r2=1.43.2.5&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.4
php-src/ext/date/php_date.c:1.43.2.5
--- php-src/ext/date/php_date.c:1.43.2.4Fri Sep 2 05:33:08 2005
+++ php-src/ext/date/php_date.c Fri Sep 2 10:58:01 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.4 2005/09/02 09:33:08 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.5 2005/09/02 14:58:01 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -55,6 +55,10 @@
PHP_FE(date_timezone_set, NULL)
PHP_FE(date_offset_get, NULL)
+ PHP_FE(date_time_set, NULL)
+ PHP_FE(date_date_set, NULL)
+ PHP_FE(date_isodate_set, NULL)
+
PHP_FE(timezone_open, NULL)
PHP_FE(timezone_name_get, NULL)
PHP_FE(timezone_offset_get, NULL)
@@ -76,6 +80,9 @@
ZEND_NAMED_FE(getTimezone, ZEND_FN(date_timezone_get), NULL)
ZEND_NAMED_FE(setTimezone, ZEND_FN(date_timezone_set), NULL)
ZEND_NAMED_FE(getOffset, ZEND_FN(date_offset_get), NULL)
+ ZEND_NAMED_FE(setTime, ZEND_FN(date_time_set), NULL)
+ ZEND_NAMED_FE(setDate, ZEND_FN(date_date_set), NULL)
+ ZEND_NAMED_FE(setISODate, ZEND_FN(date_isodate_set), NULL)
{NULL, NULL, NULL}
};
@@ -1155,6 +1162,57 @@
}
}
+PHP_FUNCTION(date_time_set)
+{
+ zval *object;
+ php_date_obj *dateobj;
+ long h, i, s = 0;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Oll|l", &object, date_ce_date, &h, &i, &s) == FAILURE) {
+ RETURN_FALSE;
+ }
+ dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
+ dateobj->time->h = h;
+ dateobj->time->i = i;
+ dateobj->time->s = s;
+ timelib_update_ts(dateobj->time, NULL);
+}
+
+PHP_FUNCTION(date_date_set)
+{
+ zval *object;
+ php_date_obj *dateobj;
+ long y, m, d;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Olll", &object, date_ce_date, &y, &m, &d) == FAILURE) {
+ RETURN_FALSE;
+ }
+ dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
+ dateobj->time->y = y;
+ dateobj->time->m = m;
+ dateobj->time->d = d;
+ timelib_update_ts(dateobj->time, NULL);
+}
+
+PHP_FUNCTION(date_isodate_set)
+{
+ zval *object;
+ php_date_obj *dateobj;
+ long y, w, d = 1;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Oll|l", &object, date_ce_date, &y, &w, &d) == FAILURE) {
+ RETURN_FALSE;
+ }
+ dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
+ dateobj->time->y = y;
+ dateobj->time->m = 1;
+ dateobj->time->d = 1;
+ dateobj->time->relative.d = timelib_daynr_from_weeknr(y, w, d);
+ dateobj->time->have_relative = 1;
+
+ timelib_update_ts(dateobj->time, NULL);
+}
+
PHP_FUNCTION(timezone_open)
{
http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.17.2.1&r2=1.17.2.2&ty=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.1
php-src/ext/date/php_date.h:1.17.2.2
--- php-src/ext/date/php_date.h:1.17.2.1Thu Aug 25 05:47:25 2005
+++ php-src/ext/date/php_date.h Fri Sep 2 10:58:01 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.h,v 1.17.2.1 2005/08/25 09:47:25 derick Exp $ */
+/* $Id: php_date.h,v 1.17.2.2 2005/09/02 14:58:01 derick Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -51,6 +51,10 @@
PHP_FUNCTION(date_timezone_set);
PHP_FUNCTION(date_offset_get);
+PHP_FUNCTION(date_time_set);
+PHP_FUNCTION(date_date_set);
+PHP_FUNCTION(date_isodate_set);
+
PHP_FUNCTION(timezone_open);
PHP_FUNCTION(timezone_name_get);
PHP_FUNCTION(timezone_offset_get);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c php_date.h
derick Fri Sep 2 10:57:42 2005 EDT
Modified files:
/php-src/ext/date php_date.c php_date.h
Log:
- Added date_time_set, date_date_set and date_isodate_set() functions, and
setTime, setDate and setISODate() methods.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.51&r2=1.52&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.51 php-src/ext/date/php_date.c:1.52
--- php-src/ext/date/php_date.c:1.51Fri Sep 2 05:41:06 2005
+++ php-src/ext/date/php_date.c Fri Sep 2 10:57:41 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.51 2005/09/02 09:41:06 derick Exp $ */
+/* $Id: php_date.c,v 1.52 2005/09/02 14:57:41 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -57,6 +57,10 @@
PHP_FE(date_timezone_set, NULL)
PHP_FE(date_offset_get, NULL)
+ PHP_FE(date_time_set, NULL)
+ PHP_FE(date_date_set, NULL)
+ PHP_FE(date_isodate_set, NULL)
+
PHP_FE(timezone_open, NULL)
PHP_FE(timezone_name_get, NULL)
PHP_FE(timezone_offset_get, NULL)
@@ -78,6 +82,9 @@
ZEND_NAMED_FE(getTimezone, ZEND_FN(date_timezone_get), NULL)
ZEND_NAMED_FE(setTimezone, ZEND_FN(date_timezone_set), NULL)
ZEND_NAMED_FE(getOffset, ZEND_FN(date_offset_get), NULL)
+ ZEND_NAMED_FE(setTime, ZEND_FN(date_time_set), NULL)
+ ZEND_NAMED_FE(setDate, ZEND_FN(date_date_set), NULL)
+ ZEND_NAMED_FE(setISODate, ZEND_FN(date_isodate_set), NULL)
{NULL, NULL, NULL}
};
@@ -1290,6 +1297,57 @@
}
}
+PHP_FUNCTION(date_time_set)
+{
+ zval *object;
+ php_date_obj *dateobj;
+ long h, i, s = 0;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Oll|l", &object, date_ce_date, &h, &i, &s) == FAILURE) {
+ RETURN_FALSE;
+ }
+ dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
+ dateobj->time->h = h;
+ dateobj->time->i = i;
+ dateobj->time->s = s;
+ timelib_update_ts(dateobj->time, NULL);
+}
+
+PHP_FUNCTION(date_date_set)
+{
+ zval *object;
+ php_date_obj *dateobj;
+ long y, m, d;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Olll", &object, date_ce_date, &y, &m, &d) == FAILURE) {
+ RETURN_FALSE;
+ }
+ dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
+ dateobj->time->y = y;
+ dateobj->time->m = m;
+ dateobj->time->d = d;
+ timelib_update_ts(dateobj->time, NULL);
+}
+
+PHP_FUNCTION(date_isodate_set)
+{
+ zval *object;
+ php_date_obj *dateobj;
+ long y, w, d = 1;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Oll|l", &object, date_ce_date, &y, &w, &d) == FAILURE) {
+ RETURN_FALSE;
+ }
+ dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
+ dateobj->time->y = y;
+ dateobj->time->m = 1;
+ dateobj->time->d = 1;
+ dateobj->time->relative.d = timelib_daynr_from_weeknr(y, w, d);
+ dateobj->time->have_relative = 1;
+
+ timelib_update_ts(dateobj->time, NULL);
+}
+
PHP_FUNCTION(timezone_open)
{
http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.19&r2=1.20&ty=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.19 php-src/ext/date/php_date.h:1.20
--- php-src/ext/date/php_date.h:1.19Wed Aug 24 09:47:23 2005
+++ php-src/ext/date/php_date.h Fri Sep 2 10:57:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.h,v 1.19 2005/08/24 13:47:23 derick Exp $ */
+/* $Id: php_date.h,v 1.20 2005/09/02 14:57:42 derick Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -52,6 +52,10 @@
PHP_FUNCTION(date_timezone_set);
PHP_FUNCTION(date_offset_get);
+PHP_FUNCTION(date_time_set);
+PHP_FUNCTION(date_date_set);
+PHP_FUNCTION(date_isodate_set);
+
PHP_FUNCTION(timezone_open);
PHP_FUNCTION(timezone_name_get);
PHP_FUNCTION(timezone_offset_get);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c php_ini.c php_ini.h
sniper Fri Sep 2 10:08:10 2005 EDT
Modified files:
/php-src/main main.c php_ini.c php_ini.h
Log:
revert
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.647&r2=1.648&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.647 php-src/main/main.c:1.648
--- php-src/main/main.c:1.647 Thu Sep 1 10:42:52 2005
+++ php-src/main/main.c Fri Sep 2 10:08:09 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.647 2005/09/01 14:42:52 sniper Exp $ */
+/* $Id: main.c,v 1.648 2005/09/02 14:08:09 sniper Exp $ */
/* {{{ includes
*/
@@ -1535,8 +1535,10 @@
le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index
pointer", 0);
- /* Initialize configuration_hash */
- if (php_init_config_hash() == FAILURE) {
+ /* this will read in php.ini, set up the configuration parameters,
+ load zend extensions and register php function extensions
+ to be loaded later */
+ if (php_init_config(TSRMLS_C) == FAILURE) {
return FAILURE;
}
@@ -1546,13 +1548,6 @@
/* Register Zend ini entries */
zend_register_standard_ini_entries(TSRMLS_C);
- /* this will read in php.ini, set up the configuration parameters,
- load zend extensions and register php function extensions
- to be loaded later */
- if (php_init_config(TSRMLS_C) == FAILURE) {
- return FAILURE;
- }
-
orig_unicode = UG(unicode);
UG(unicode) = 0;
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.138&r2=1.139&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.138 php-src/main/php_ini.c:1.139
--- php-src/main/php_ini.c:1.138Fri Sep 2 04:26:05 2005
+++ php-src/main/php_ini.c Fri Sep 2 10:08:09 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.138 2005/09/02 08:26:05 sniper Exp $ */
+/* $Id: php_ini.c,v 1.139 2005/09/02 14:08:09 sniper Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -254,14 +254,6 @@
}
/* }}} */
-/* {{{ php_init_config_hash
- */
-int php_init_config_hash(void)
-{
- return zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1);
-}
-/* }}} */
-
/* {{{ php_init_config
*/
int php_init_config(TSRMLS_D)
@@ -278,6 +270,10 @@
int l, total_l=0;
zend_llist_element *element;
+ if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1) == FAILURE) {
+ return FAILURE;
+ }
+
if (sapi_module.ini_defaults) {
sapi_module.ini_defaults(&configuration_hash);
}
http://cvs.php.net/diff.php/php-src/main/php_ini.h?r1=1.46&r2=1.47&ty=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.46 php-src/main/php_ini.h:1.47
--- php-src/main/php_ini.h:1.46 Thu Sep 1 10:42:54 2005
+++ php-src/main/php_ini.h Fri Sep 2 10:08:09 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.h,v 1.46 2005/09/01 14:42:54 sniper Exp $ */
+/* $Id: php_ini.h,v 1.47 2005/09/02 14:08:09 sniper Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -24,7 +24,6 @@
#include "zend_ini.h"
BEGIN_EXTERN_C()
-int php_init_config_hash(void);
int php_init_config(TSRMLS_D);
int php_shutdown_config(void);
void php_ini_register_extensions(TSRMLS_D);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /main main.c php_ini.c php_ini.h
sniper Fri Sep 2 10:05:47 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main main.c php_ini.c php_ini.h
Log:
Revert
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.3&r2=1.640.2.4&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.3 php-src/main/main.c:1.640.2.4
--- php-src/main/main.c:1.640.2.3 Thu Sep 1 10:44:14 2005
+++ php-src/main/main.c Fri Sep 2 10:05:45 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.3 2005/09/01 14:44:14 sniper Exp $ */
+/* $Id: main.c,v 1.640.2.4 2005/09/02 14:05:45 sniper Exp $ */
/* {{{ includes
*/
@@ -1415,17 +1415,6 @@
le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index
pointer", 0);
- /* Initialize configuration_hash */
- if (php_init_config_hash() == FAILURE) {
- return FAILURE;
- }
-
- /* Register PHP core ini entries */
- REGISTER_INI_ENTRIES();
-
- /* Register Zend ini entries */
- zend_register_standard_ini_entries(TSRMLS_C);
-
/* this will read in php.ini, set up the configuration parameters,
load zend extensions and register php function extensions
to be loaded later */
@@ -1433,6 +1422,12 @@
return FAILURE;
}
+ /* Register PHP core ini entries */
+ REGISTER_INI_ENTRIES();
+
+ /* Register Zend ini entries */
+ zend_register_standard_ini_entries(TSRMLS_C);
+
/* Disable realpath cache if safe_mode or open_basedir are set */
if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
CWDG(realpath_cache_size_limit) = 0;
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.136.2.2&r2=1.136.2.3&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.2 php-src/main/php_ini.c:1.136.2.3
--- php-src/main/php_ini.c:1.136.2.2Fri Sep 2 04:24:14 2005
+++ php-src/main/php_ini.c Fri Sep 2 10:05:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.2 2005/09/02 08:24:14 sniper Exp $ */
+/* $Id: php_ini.c,v 1.136.2.3 2005/09/02 14:05:45 sniper Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -254,14 +254,6 @@
}
/* }}} */
-/* {{{ php_init_config_hash
- */
-int php_init_config_hash(void)
-{
- return zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1);
-}
-/* }}} */
-
/* {{{ php_init_config
*/
int php_init_config(TSRMLS_D)
@@ -278,6 +270,10 @@
int l, total_l=0;
zend_llist_element *element;
+ if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1) == FAILURE) {
+ return FAILURE;
+ }
+
if (sapi_module.ini_defaults) {
sapi_module.ini_defaults(&configuration_hash);
}
http://cvs.php.net/diff.php/php-src/main/php_ini.h?r1=1.45.2.1&r2=1.45.2.2&ty=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.45.2.1 php-src/main/php_ini.h:1.45.2.2
--- php-src/main/php_ini.h:1.45.2.1 Thu Sep 1 10:44:15 2005
+++ php-src/main/php_ini.h Fri Sep 2 10:05:46 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.h,v 1.45.2.1 2005/09/01 14:44:15 sniper Exp $ */
+/* $Id: php_ini.h,v 1.45.2.2 2005/09/02 14:05:46 sniper Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -24,7 +24,6 @@
#include "zend_ini.h"
BEGIN_EXTERN_C()
-int php_init_config_hash(void);
int php_init_config(TSRMLS_D);
int php_shutdown_config(void);
void php_ini_register_extensions(TSRMLS_D);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/apache2handler sapi_apache2.c
sniper Fri Sep 2 09:52:55 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.40.2.2&r2=1.1.2.40.2.3&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.2
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.3
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.2 Wed Aug 17
21:15:52 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Sep 2 09:52:55 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40.2.2 2005/08/18 01:15:52 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.3 2005/09/02 13:52:55 sniper Exp $ */
#include
@@ -538,7 +538,7 @@
} else {
parent_req = ctx->r;
/* check if comming due to ErrorDocument */
- if (parent_req != HTTP_OK) {
+ if (parent_req && parent_req->status != HTTP_OK) {
parent_req = NULL;
goto normal;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/apache2handler sapi_apache2.c
sniper Fri Sep 2 09:51:47 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.1&r2=1.57.2.2&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.1
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.2
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.1 Wed Aug 17 21:14:41 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Sep 2 09:51:47 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.1 2005/08/18 01:14:41 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.2 2005/09/02 13:51:47 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -538,7 +538,7 @@
} else {
parent_req = ctx->r;
/* check if comming due to ErrorDocument */
- if (parent_req != HTTP_OK) {
+ if (parent_req && parent_req->status != HTTP_OK) {
parent_req = NULL;
goto normal;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c
sniper Fri Sep 2 09:51:26 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.10&r2=1.40.2.11&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.10
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.11
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.10Wed Aug 17
21:15:23 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Sep 2 09:51:26 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.10 2005/08/18 01:15:23 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.11 2005/09/02 13:51:26 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -524,7 +524,7 @@
} else {
parent_req = ctx->r;
/* check if comming due to ErrorDocument */
- if (parent_req != HTTP_OK) {
+ if (parent_req && parent_req->status != HTTP_OK) {
parent_req = NULL;
goto normal;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
sniper Fri Sep 2 09:50:41 2005 EDT
Modified files:
/php-src/sapi/apache2handlersapi_apache2.c
Log:
Check the status properly
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.58&r2=1.59&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.58
php-src/sapi/apache2handler/sapi_apache2.c:1.59
--- php-src/sapi/apache2handler/sapi_apache2.c:1.58 Wed Aug 17 21:11:13 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Sep 2 09:50:39 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.58 2005/08/18 01:11:13 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.59 2005/09/02 13:50:39 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -538,7 +538,7 @@
} else {
parent_req = ctx->r;
/* check if comming due to ErrorDocument */
- if (parent_req != HTTP_OK) {
+ if (parent_req && parent_req->status != HTTP_OK) {
parent_req = NULL;
goto normal;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] RE: cvs: php-src /main main.c php_ini.c php_ini.h
extension_dir = "N:\cvs projects\php\debug_ts" The value doesnt really matter. no matter what goes in there the value ends up always being the default value. With your change the extension directory always is: extension_dir="C:\php6\debug This value is what is in the config.w32.h file and no where in my ini file. I'm assuming the 5.1 branch has the same problem - will test once I update that build - since this problem started right after your change. The ini settings are set before the ini is read in for that section so default values are used. Rob Jani Taskinen wrote: What exactly do you have in your php.ini for that setting..? Works fine for me.. --Jani On Fri, 2 Sep 2005, Rob Richards wrote: That fix for bug #34307 broke my ini settings. For example PHP_EXTENSION_DIR no longer is pulled from ini file. only gets default value. I had to move REGISTER_INI_ENTRIES(); and zend_register_standard_ini_entries(TSRMLS_C); after the php_init_config() call again to get it working. Code now looks like it did before other than php_init_config_hash() now being called on its own rather than within php_init_config(). attached is the patch i had to do to get it working again. note: this is under windows havent tried it elsewhere. Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/lib dow.c timelib.h
derick Fri Sep 2 05:41:10 2005 EDT
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/lib dow.c timelib.h
Log:
- MF51: Fixed bug #34304 (date() doesn't have a modifier for ISO Week Day).
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.50&r2=1.51&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.50 php-src/ext/date/php_date.c:1.51
--- php-src/ext/date/php_date.c:1.50Fri Sep 2 05:39:21 2005
+++ php-src/ext/date/php_date.c Fri Sep 2 05:41:06 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.50 2005/09/02 09:39:21 derick Exp $ */
+/* $Id: php_date.c,v 1.51 2005/09/02 09:41:06 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -489,6 +489,7 @@
case 'l': length = date_spprintf(&buffer, 32 TSRMLS_CC,
"%R", localized ? IS_UNICODE : IS_STRING,
dayname_full(timelib_day_of_week(t->y, t->m, t->d), localized)); break;
case 'S': length = date_spprintf(&buffer, 32 TSRMLS_CC,
"%s", english_suffix(t->d)); break;
case 'w': length = date_spprintf(&buffer, 32 TSRMLS_CC,
"%d", (int) timelib_day_of_week(t->y, t->m, t->d)); break;
+ case 'N': length = date_spprintf(&buffer, 32 TSRMLS_CC,
"%d", (int) timelib_iso_day_of_week(t->y, t->m, t->d)); break;
case 'z': length = date_spprintf(&buffer, 32 TSRMLS_CC,
"%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break;
/* week */
http://cvs.php.net/diff.php/php-src/ext/date/lib/dow.c?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/date/lib/dow.c
diff -u php-src/ext/date/lib/dow.c:1.9 php-src/ext/date/lib/dow.c:1.10
--- php-src/ext/date/lib/dow.c:1.9 Wed Aug 31 10:31:45 2005
+++ php-src/ext/date/lib/dow.c Fri Sep 2 05:41:08 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dow.c,v 1.9 2005/08/31 14:31:45 derick Exp $ */
+/* $Id: dow.c,v 1.10 2005/09/02 09:41:08 derick Exp $ */
#include "timelib.h"
@@ -31,9 +31,9 @@
return c < 0 ? c + 7 : c;
}
-timelib_sll timelib_day_of_week(timelib_sll y, timelib_sll m, timelib_sll d)
+static timelib_sll timelib_day_of_week_ex(timelib_sll y, timelib_sll m,
timelib_sll d, int iso)
{
- timelib_sll c1, y1, m1;
+ timelib_sll c1, y1, m1, dow;
/* Only valid for Gregorian calendar */
if (y < 1753) {
@@ -42,7 +42,23 @@
c1 = century_value(y / 100);
y1 = (y % 100);
m1 = timelib_is_leap(y) ? m_table_leap[m] : m_table_common[m];
- return (c1 + y1 + m1 + (y1 / 4) + d) % 7;
+ dow = (c1 + y1 + m1 + (y1 / 4) + d) % 7;
+ if (iso) {
+ if (dow == 0) {
+ dow = 7;
+ }
+ }
+ return dow;
+}
+
+timelib_sll timelib_day_of_week(timelib_sll y, timelib_sll m, timelib_sll d)
+{
+ return timelib_day_of_week_ex(y, m, d, 0);
+}
+
+timelib_sll timelib_iso_day_of_week(timelib_sll y, timelib_sll m, timelib_sll
d)
+{
+ return timelib_day_of_week_ex(y, m, d, 1);
}
/* jan feb mar apr may jun jul aug
sep oct nov dec */
http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib.h?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/date/lib/timelib.h
diff -u php-src/ext/date/lib/timelib.h:1.11 php-src/ext/date/lib/timelib.h:1.12
--- php-src/ext/date/lib/timelib.h:1.11 Fri Aug 12 19:46:42 2005
+++ php-src/ext/date/lib/timelib.h Fri Sep 2 05:41:08 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: timelib.h,v 1.11 2005/08/12 23:46:42 wez Exp $ */
+/* $Id: timelib.h,v 1.12 2005/09/02 09:41:08 derick Exp $ */
#ifndef __TIMELIB_H__
#define __TIMELIB_H__
@@ -40,6 +40,7 @@
/* From dow.c */
timelib_sll timelib_day_of_week(timelib_sll y, timelib_sll m, timelib_sll d);
+timelib_sll timelib_iso_day_of_week(timelib_sll y, timelib_sll m, timelib_sll
d);
timelib_sll timelib_day_of_year(timelib_sll y, timelib_sll m, timelib_sll d);
timelib_sll timelib_daynr_from_weeknr(timelib_sll y, timelib_sll w,
timelib_sll d);
timelib_sll timelib_days_in_month(timelib_sll y, timelib_sll m);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Fri Sep 2 05:39:21 2005 EDT Modified files: /php-src/ext/date php_date.c Log: - Fixed bad MF51. http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.49&r2=1.50&ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.49 php-src/ext/date/php_date.c:1.50 --- php-src/ext/date/php_date.c:1.49Tue Aug 30 05:17:56 2005 +++ php-src/ext/date/php_date.c Fri Sep 2 05:39:21 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.49 2005/08/30 09:17:56 derick Exp $ */ +/* $Id: php_date.c,v 1.50 2005/09/02 09:39:21 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -492,7 +492,7 @@ case 'z': length = date_spprintf(&buffer, 32 TSRMLS_CC, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break; /* week */ - case 'W': length = date_spprintf(&buffer, 32 TSRMLS_CC, "%0d", (int) isoweek); break; /* iso weeknr */ + case 'W': length = date_spprintf(&buffer, 32 TSRMLS_CC, "%02d", (int) isoweek); break; /* iso weeknr */ case 'o': length = date_spprintf(&buffer, 32 TSRMLS_CC, "%d", (int) isoyear); break; /* iso year */ /* month */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c /ext/date/lib dow.c timelib.h /ext/date/tests bug34304.phpt
derick Fri Sep 2 05:33:09 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/date/tests bug34304.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date php_date.c
/php-src/ext/date/lib dow.c timelib.h
Log:
- Fixed bug #34304 (date() doesn't have a modifier for ISO Week Day).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.47&r2=1.2027.2.48&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.47 php-src/NEWS:1.2027.2.48
--- php-src/NEWS:1.2027.2.47Fri Sep 2 05:13:58 2005
+++ php-src/NEWSFri Sep 2 05:33:05 2005
@@ -25,6 +25,7 @@
- Fixed bug #34310 (foreach($arr as $c->d => $x) crashes). (Dmitry)
- Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty). (Jani)
- Fixed bug #34306 (wddx_serialize_value() crashes with long array keys).
(Jani)
+- Fixed bug #34304 (date() doesn't have a modifier for ISO Week Day). (Derick)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)
- Fixed bug #34299 (ReflectionClass::isInstantiable() returns true for abstract
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.3&r2=1.43.2.4&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.3
php-src/ext/date/php_date.c:1.43.2.4
--- php-src/ext/date/php_date.c:1.43.2.3Tue Aug 30 05:17:09 2005
+++ php-src/ext/date/php_date.c Fri Sep 2 05:33:08 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.3 2005/08/30 09:17:09 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.4 2005/09/02 09:33:08 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -389,6 +389,7 @@
case 'l': snprintf(buffer, 32, "%s",
day_full_names[timelib_day_of_week(t->y, t->m, t->d)]); break;
case 'S': snprintf(buffer, 32, "%s",
english_suffix(t->d)); break;
case 'w': snprintf(buffer, 32, "%d", (int)
timelib_day_of_week(t->y, t->m, t->d)); break;
+ case 'N': snprintf(buffer, 32, "%d", (int)
timelib_iso_day_of_week(t->y, t->m, t->d)); break;
case 'z': snprintf(buffer, 32, "%d", (int)
timelib_day_of_year(t->y, t->m, t->d)); break;
/* week */
http://cvs.php.net/diff.php/php-src/ext/date/lib/dow.c?r1=1.8.2.1&r2=1.8.2.2&ty=u
Index: php-src/ext/date/lib/dow.c
diff -u php-src/ext/date/lib/dow.c:1.8.2.1 php-src/ext/date/lib/dow.c:1.8.2.2
--- php-src/ext/date/lib/dow.c:1.8.2.1 Wed Aug 31 10:29:23 2005
+++ php-src/ext/date/lib/dow.c Fri Sep 2 05:33:08 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dow.c,v 1.8.2.1 2005/08/31 14:29:23 derick Exp $ */
+/* $Id: dow.c,v 1.8.2.2 2005/09/02 09:33:08 derick Exp $ */
#include "timelib.h"
@@ -31,9 +31,9 @@
return c < 0 ? c + 7 : c;
}
-timelib_sll timelib_day_of_week(timelib_sll y, timelib_sll m, timelib_sll d)
+static timelib_sll timelib_day_of_week_ex(timelib_sll y, timelib_sll m,
timelib_sll d, int iso)
{
- timelib_sll c1, y1, m1;
+ timelib_sll c1, y1, m1, dow;
/* Only valid for Gregorian calendar */
if (y < 1753) {
@@ -42,7 +42,23 @@
c1 = century_value(y / 100);
y1 = (y % 100);
m1 = timelib_is_leap(y) ? m_table_leap[m] : m_table_common[m];
- return (c1 + y1 + m1 + (y1 / 4) + d) % 7;
+ dow = (c1 + y1 + m1 + (y1 / 4) + d) % 7;
+ if (iso) {
+ if (dow == 0) {
+ dow = 7;
+ }
+ }
+ return dow;
+}
+
+timelib_sll timelib_day_of_week(timelib_sll y, timelib_sll m, timelib_sll d)
+{
+ return timelib_day_of_week_ex(y, m, d, 0);
+}
+
+timelib_sll timelib_iso_day_of_week(timelib_sll y, timelib_sll m, timelib_sll
d)
+{
+ return timelib_day_of_week_ex(y, m, d, 1);
}
/* jan feb mar apr may jun jul aug
sep oct nov dec */
http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib.h?r1=1.10.2.1&r2=1.10.2.2&ty=u
Index: php-src/ext/date/lib/timelib.h
diff -u php-src/ext/date/lib/timelib.h:1.10.2.1
php-src/ext/date/lib/timelib.h:1.10.2.2
--- php-src/ext/date/lib/timelib.h:1.10.2.1 Thu Aug 25 05:47:27 2005
+++ php-src/ext/date/lib/timelib.h Fri Sep 2 05:33:08 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: timelib.h,v 1.10.2.1 2005/08/25 09:47:27 derick Exp $ */
+/* $Id: timelib.h,v 1.10.2.2 2005/09/02 09:33:08 derick Exp $ */
#ifndef __TIMELIB_H__
#define __TIMELIB_H__
@@ -40,6 +40,7 @@
/* From dow.c */
timelib_sll timelib_day_of_week(timelib_sll y, timelib_sll m, timelib_sll d);
+timelib_sll timelib_iso_day_of_week(timelib_sll y, timelib_sll m, timelib_sll
d);
timelib_sll timelib_day_of_year(timelib_sll y, timelib_sll m, timelib_sll d);
tim
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mcve .cvsignore CREDITS config.m4 config.w32 mcve.c mcve.dsp mcve.php mcve_simple_test.php mcve_test1.php mcve_test2.php php_mcve.h /ext/mcve/tests .cvsig
sniper Fri Sep 2 05:14:10 2005 EDT Removed files: (Branch: PHP_5_1) /php-src/ext/ovrimos.cvsignore CREDITS config.m4 ovrimos.c php_ovrimos.h /php-src/ext/mcve .cvsignore CREDITS config.m4 config.w32 mcve.c mcve.dsp mcve.php mcve_simple_test.php mcve_test1.php mcve_test2.php php_mcve.h /php-src/ext/mcve/tests .cvsignore 001.phpt /php-src/ext/pfpro .cvsignore CREDITS TODO config.m4 pfpro.c php_pfpro.h Modified files: /php-srcNEWS Log: - Moved exts to PECL http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.46&r2=1.2027.2.47&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.46 php-src/NEWS:1.2027.2.47 --- php-src/NEWS:1.2027.2.46Fri Sep 2 03:47:25 2005 +++ php-src/NEWSFri Sep 2 05:13:58 2005 @@ -12,7 +12,10 @@ . ming 0.3b . libpq (PostgreSQL) 8.0.1 - Moved extensions to PECL: + . ext/mcve (Jani, Derick, Pierre) . ext/oracle (Jani, Derick) + . ext/ovrimos (Jani, Derick, Pierre) + . ext/pfpro (Jani, Derick, Pierre) - Fixed a bug where stream_get_meta_data() did not return the "uri" element for files opened with tmpname(). (Derick) - Fixed "make test" to work for phpized extensions. (Hartmut, Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mcve .cvsignore CREDITS config.m4 config.w32 mcve.c mcve.dsp mcve.php mcve_simple_test.php mcve_test1.php mcve_test2.php php_mcve.h /ext/mcve/tests .cvsignore 001.phpt /e
sniper Fri Sep 2 05:10:01 2005 EDT Removed files: /php-src/ext/pfpro .cvsignore CREDITS TODO config.m4 pfpro.c php_pfpro.h /php-src/ext/ovrimos.cvsignore CREDITS config.m4 ovrimos.c php_ovrimos.h /php-src/ext/mcve .cvsignore CREDITS config.m4 config.w32 mcve.c mcve.dsp mcve.php mcve_simple_test.php mcve_test1.php mcve_test2.php php_mcve.h /php-src/ext/mcve/tests .cvsignore 001.phpt Log: - Moved pfpro, ovrimos and mcve to PECL # Pierre will create the packages for these -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Fri Sep 2 05:07:42 2005 EDT Modified files: /CVSROOTavail Log: - Add PECL karma to people which maintain extensions that were moved to PECL. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1014&r2=1.1015&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1014 CVSROOT/avail:1.1015 --- CVSROOT/avail:1.1014Thu Sep 1 20:36:59 2005 +++ CVSROOT/avail Fri Sep 2 05:07:38 2005 @@ -178,10 +178,10 @@ avail|asautins,dbenson,maxim,ray,abonamous,ldixon|php-src/ext/oci8 avail|kara,fmk,sschadt,nicos|php-src/ext/odbc avail|venaas|php-src/ext/openssl -avail|mitch,kara|php-src/ext/oracle -avail|nmav|php-src/ext/ovrimos +avail|mitch,kara|php-src/ext/oracle,pecl/oracle +avail|nmav|php-src/ext/ovrimos,pecl/ovrimos avail|steinm,uw|php-src/ext/pdf -avail|jdonagher,david|php-src/ext/pfpro +avail|jdonagher,david|php-src/ext/pfpro,pecl/pfpro avail|jah,chriskl|php-src/ext/pgsql,phpdoc/en/reference/pgsql,php-src/NEWS,php-src/ext/pdo_pgsql avail|ostborn|php-src/ext/phpdoc,pecl/phpdoc,pecl/soap,pear/Image_GIS avail|delatbabel,justinpatrin|pear/Text_Wiki @@ -216,7 +216,7 @@ avail|akilov,stoddard,gtanzilli|php-src/sapi/servlet avail|phanto,jtate|php-src/win32 avail|georg|php-src/ext/ncurses -avail|bradmssw|php-src/ext/mcve +avail|bradmssw|php-src/ext/mcve,pecl/mcve avail|iliaa|php-src/ext/shmop avail|jtate,skettler|pecl/crack avail|dmcfarli|pecl/staf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_ini.c
sniper Fri Sep 2 04:26:05 2005 EDT
Modified files:
/php-src/main php_ini.c
Log:
MFB: Always return something, even if it succeeds :)
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.137&r2=1.138&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.137 php-src/main/php_ini.c:1.138
--- php-src/main/php_ini.c:1.137Thu Sep 1 10:42:53 2005
+++ php-src/main/php_ini.c Fri Sep 2 04:26:05 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.137 2005/09/01 14:42:53 sniper Exp $ */
+/* $Id: php_ini.c,v 1.138 2005/09/02 08:26:05 sniper Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -258,9 +258,7 @@
*/
int php_init_config_hash(void)
{
- if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1) == FAILURE) {
- return FAILURE;
- }
+ return zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /main php_ini.c
sniper Fri Sep 2 04:24:15 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main php_ini.c
Log:
it is good idea to return something always
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.136.2.1&r2=1.136.2.2&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.1 php-src/main/php_ini.c:1.136.2.2
--- php-src/main/php_ini.c:1.136.2.1Thu Sep 1 10:44:15 2005
+++ php-src/main/php_ini.c Fri Sep 2 04:24:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.1 2005/09/01 14:44:15 sniper Exp $ */
+/* $Id: php_ini.c,v 1.136.2.2 2005/09/02 08:24:14 sniper Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -258,9 +258,7 @@
*/
int php_init_config_hash(void)
{
- if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1) == FAILURE) {
- return FAILURE;
- }
+ return zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] RE: cvs: php-src /main main.c php_ini.c php_ini.h
What exactly do you have in your php.ini for that setting..? Works fine for me.. --Jani On Fri, 2 Sep 2005, Rob Richards wrote: That fix for bug #34307 broke my ini settings. For example PHP_EXTENSION_DIR no longer is pulled from ini file. only gets default value. I had to move REGISTER_INI_ENTRIES(); and zend_register_standard_ini_entries(TSRMLS_C); after the php_init_config() call again to get it working. Code now looks like it did before other than php_init_config_hash() now being called on its own rather than within php_init_config(). attached is the patch i had to do to get it working again. note: this is under windows havent tried it elsewhere. Rob -- Donate @ http://pecl.php.net/wishlist.php/sniper -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
