[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Jan 18 01:31:46 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2930r2=1.2931diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2930 php-src/ChangeLog:1.2931 --- php-src/ChangeLog:1.2930Thu Jan 17 01:31:31 2008 +++ php-src/ChangeLog Fri Jan 18 01:31:44 2008 @@ -1,3 +1,125 @@ +2008-01-17 Nuno Lopes [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + pcre 7.5 is in 5.2 branch as well + +2008-01-17 Greg Beaver [EMAIL PROTECTED] + +* (PHP_5_2) + win32/build/confutils.js: + MFH: add errors when missing dependencies (Steph) + +2008-01-17 Derick Rethans [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ext/date/lib/tm2unixtime.c + ext/date/lib/tm2unixtime.c + ext/date/tests/bug41599.phpt: + - Fixed bug #41599 (setTime() fails after modify() is used). + +* ext/date/tests/bug41599.phpt + ext/date/tests/bug41599.phpt: + + - Fixed bug #41599 (setTime() fails after modify() is used). + +* (PHP_5_3) + NEWS + ext/date/lib/parse_date.c + ext/date/lib/parse_date.re + ext/date/tests/bug43075.phpt: + - MFH: Fixed bug #43075 (Support 2007-11-01T24:00:00+00:00). + +* ext/date/lib/parse_date.c + ext/date/lib/parse_date.re + ext/date/tests/bug43075.phpt + ext/date/tests/bug43075.phpt: + - Fixed bug #43075 (Support 2007-11-01T24:00:00+00:00). + +* (PHP_5_3) + NEWS + ext/date/php_date.c + ext/date/tests/bug43808.phpt: + - MFH: Fixed bug #43808 (date_create never fails (even when it should)). + +* ext/date/php_date.c + ext/date/tests/bug43808.phpt + ext/date/tests/bug43808.phpt: + - Fixed bug #43808 (date_create never fails (even when it should)). + +* (PHP_5_3) + NEWS + ext/date/php_date.c + ext/date/php_date.c + ext/date/tests/bug43003.phpt: + - Fixed bug #43003 (Invalid timezone reported for DateTime objects + constructed +using a timestamp). + +* ext/date/tests/bug43003.phpt + ext/date/tests/bug43003.phpt: + + - Fixed bug #43003 (Invalid timezone reported for DateTime objects + constructed +using a timestamp). + +* (PHP_5_3) + NEWS + ext/date/php_date.c + ext/date/lib/parse_date.c + ext/date/tests/bug40743.phpt + ext/date/tests/bug42910.phpt + ext/date/tests/bug43527.phpt: + - MFH: Added support for abbreviation and offset based timezone specifiers + for +DateTime::getOffset() and DateTime::getName(). + - MFH: Fixed bug #43527 (DateTime created from a timestamp reports + environment +timezone). + - MFH: Fixed bug #42190 (Constructing DateTime with TimeZone Indicator +invalidates DateTimeZone). + +* ext/date/tests/bug40743.phpt + ext/date/tests/bug40743.phpt + ext/date/tests/bug42910.phpt + ext/date/tests/bug42910.phpt + ext/date/tests/bug43527.phpt + ext/date/tests/bug43527.phpt: + + - Added support for abbreviation and offset based timezone specifiers for +DateTime::getOffset() and DateTime::getName(). + - Fixed bug #43527 (DateTime created from a timestamp reports environment +timezone). + - Fixed bug #42190 (Constructing DateTime with TimeZone Indicator + invalidates +DateTimeZone). + +* ext/date/php_date.c: + - Added support for abbreviation and offset based timezone specifiers for +DateTime::getOffset() and DateTime::getName(). + - Fixed bug #43527 (DateTime created from a timestamp reports environment +timezone). + - Fixed bug #42190 (Constructing DateTime with TimeZone Indicator + invalidates +DateTimeZone). + +2008-01-17 Lukas Smith [EMAIL PROTECTED] + +* README.MAILINGLIST_RULES: + - mention rfc 1855 + +2008-01-17 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/dns.c: + + MFB: Fixed bug #43871 (crash inside dns_get_record) + +* (PHP_5_3) + ext/standard/dns.c: + + Fixed bug #43871 (crash inside dns_get_record) + 2008-01-16 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS] cvs: php-src / README.MAILINGLIST_RULES
lsmith Thu Jan 17 14:37:58 2008 UTC Modified files: /php-srcREADME.MAILINGLIST_RULES Log: - mention rfc 1855 http://cvs.php.net/viewvc.cgi/php-src/README.MAILINGLIST_RULES?r1=1.3r2=1.4diff_format=u Index: php-src/README.MAILINGLIST_RULES diff -u php-src/README.MAILINGLIST_RULES:1.3 php-src/README.MAILINGLIST_RULES:1.4 --- php-src/README.MAILINGLIST_RULES:1.3Fri Jan 11 14:01:52 2008 +++ php-src/README.MAILINGLIST_RULESThu Jan 17 14:37:58 2008 @@ -71,6 +71,9 @@ create an entirely new thread copying anything you wish to quote into the new thread. +Finally, additional hints on how to behave inside the virtual community can be +found in RFC 1855 (http://www.faqs.org/rfcs/rfc1855.html). + Happy hacking, PHP Team -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / README.MAILINGLIST_RULES
lsmith Thu Jan 17 14:38:16 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.MAILINGLIST_RULES Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.MAILINGLIST_RULES?r1=1.1.2.4r2=1.1.2.5diff_format=u Index: php-src/README.MAILINGLIST_RULES diff -u php-src/README.MAILINGLIST_RULES:1.1.2.4 php-src/README.MAILINGLIST_RULES:1.1.2.5 --- php-src/README.MAILINGLIST_RULES:1.1.2.4Fri Jan 11 14:02:12 2008 +++ php-src/README.MAILINGLIST_RULESThu Jan 17 14:38:16 2008 @@ -71,6 +71,9 @@ create an entirely new thread copying anything you wish to quote into the new thread. +Finally, additional hints on how to behave inside the virtual community can be +found in RFC 1855 (http://www.faqs.org/rfcs/rfc1855.html). + Happy hacking, PHP Team -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.c
iliaa Thu Jan 17 14:12:36 2008 UTC
Modified files:
/php-src/ext/standard dns.c
Log:
MFB: Fixed bug #43871 (crash inside dns_get_record)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.90r2=1.91diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.90 php-src/ext/standard/dns.c:1.91
--- php-src/ext/standard/dns.c:1.90 Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/dns.c Thu Jan 17 14:12:36 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.90 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: dns.c,v 1.91 2008/01/17 14:12:36 iliaa Exp $ */
/* {{{ includes */
#include php.h
@@ -654,7 +654,7 @@
char *hostname;
int hostname_len;
long type_param = PHP_DNS_ANY;
- zval *authns, *addtl;
+ zval *authns = NULL, *addtl = NULL;
int addtl_recs = 0;
int type_to_fetch;
struct __res_state res;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard dns.c
iliaa Thu Jan 17 14:12:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
Fixed bug #43871 (crash inside dns_get_record)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.3r2=1.70.2.7.2.5.2.4diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.3
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.4
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.3 Mon Dec 31 07:17:14 2007
+++ php-src/ext/standard/dns.c Thu Jan 17 14:12:12 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.3 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.4 2008/01/17 14:12:12 iliaa Exp $ */
/* {{{ includes */
#include php.h
@@ -654,7 +654,7 @@
char *hostname;
int hostname_len;
long type_param = PHP_DNS_ANY;
- zval *authns, *addtl;
+ zval *authns = NULL, *addtl = NULL;
int addtl_recs = 0;
int type_to_fetch;
struct __res_state res;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/date php_date.c /ext/date/lib parse_date.c /ext/date/tests bug40743.phpt bug42910.phpt bug43527.phpt
derick Thu Jan 17 18:49:55 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug40743.phpt bug42910.phpt bug43527.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date php_date.c
/php-src/ext/date/lib parse_date.c
Log:
- MFH: Added support for abbreviation and offset based timezone specifiers for
DateTime::getOffset() and DateTime::getName().
- MFH: Fixed bug #43527 (DateTime created from a timestamp reports environment
timezone).
- MFH: Fixed bug #42190 (Constructing DateTime with TimeZone Indicator
invalidates DateTimeZone).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.72r2=1.2027.2.547.2.965.2.73diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.72
php-src/NEWS:1.2027.2.547.2.965.2.73
--- php-src/NEWS:1.2027.2.547.2.965.2.72Wed Jan 16 14:21:07 2008
+++ php-src/NEWSThu Jan 17 18:49:31 2008
@@ -11,6 +11,8 @@
- strtotime() / new DateTime
- date_create_from_format() / DateTime::createFromFormat()
- date_parse_from_format()
+ * support for abbreviation and offset based timezone specifiers for
+DateTime::getOffset() and DateTime::getName().
- Added ability to use Traversable objects instead of plain arrays in ext/soap.
(Joshua Reese, Dmitry)
@@ -75,6 +77,8 @@
- Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
+- Fixed bug #43527 (DateTime created from a timestamp reports environment
+ timezone). (Derick)
- Fixed bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB). (Derick)
- Fixed bug #43136 (possible crash on script execution timeout.
The EG(function_state_ptr) is completely removed,
@@ -94,6 +98,8 @@
- Fixed bug #42548 (mysqli PROCEDURE calls can't return result sets). (hartmut)
- Fixed bug #42509 (gmp leaks memory when gmp_init() not used). (Stas)
- Fixed bug #42284 (duplicate of #39700). (Lars W)
+- Fixed bug #42190 (Constructing DateTime with TimeZone Indicator invalidates
+ DateTimeZone). (Derick)
- Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
characters). (Jani)
- Fixed bug #41522 (PDO firebird driver returns null if it fails to connect).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.8r2=1.43.2.45.2.51.2.9diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.8
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.9
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.8 Sun Jan 13 18:42:19 2008
+++ php-src/ext/date/php_date.c Thu Jan 17 18:49:31 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.8 2008/01/13 18:42:19 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.9 2008/01/17 18:49:31 derick Exp $ */
#include php.h
#include php_streams.h
@@ -273,7 +273,17 @@
struct _php_timezone_obj {
zend_object std;
- timelib_tzinfo *tz;
+ int type;
+ union {
+ timelib_tzinfo *tz; // TIMELIB_ZONETYPE_ID;
+ timelib_sll utc_offset; // TIMELIB_ZONETYPE_OFFSET
+ struct // TIMELIB_ZONETYPE_ABBR
+ {
+ timelib_sll utc_offset;
+ char*abbr;
+ int dst;
+ } z;
+ } tzi;
};
#define DATE_SET_CONTEXT \
@@ -820,7 +830,26 @@
);
break;
case 'T': length = slprintf(buffer, 32, %s, localtime
? offset-abbr : GMT); break;
- case 'e': length = slprintf(buffer, 32, %s, localtime
? t-tz_info-name : UTC); break;
+ case 'e': if (!localtime) {
+ length = slprintf(buffer, 32,
%s, UTC);
+ } else {
+ switch (t-zone_type) {
+ case
TIMELIB_ZONETYPE_ID:
+ length =
slprintf(buffer, 32, %s, t-tz_info-name);
+ break;
+ case
TIMELIB_ZONETYPE_ABBR:
+ length =
slprintf(buffer, 32, %s, offset-abbr);
+ break;
+ case
TIMELIB_ZONETYPE_OFFSET:
+ length =
slprintf(buffer, 32, %c%02d:%02d,
+
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug40743.phpt bug42910.phpt bug43527.phpt
derick Thu Jan 17 18:48:44 2008 UTC
Added files:
/php-src/ext/date/tests bug40743.phpt bug42910.phpt bug43527.phpt
Modified files:
/php-src/ext/date php_date.c
Log:
- Added support for abbreviation and offset based timezone specifiers for
DateTime::getOffset() and DateTime::getName().
- Fixed bug #43527 (DateTime created from a timestamp reports environment
timezone).
- Fixed bug #42190 (Constructing DateTime with TimeZone Indicator invalidates
DateTimeZone).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.153r2=1.154diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.153 php-src/ext/date/php_date.c:1.154
--- php-src/ext/date/php_date.c:1.153 Sun Jan 13 18:42:51 2008
+++ php-src/ext/date/php_date.c Thu Jan 17 18:48:43 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.153 2008/01/13 18:42:51 derick Exp $ */
+/* $Id: php_date.c,v 1.154 2008/01/17 18:48:43 derick Exp $ */
#include php.h
#include php_streams.h
@@ -276,7 +276,17 @@
struct _php_timezone_obj {
zend_object std;
- timelib_tzinfo *tz;
+ int type;
+ union {
+ timelib_tzinfo *tz; // TIMELIB_ZONETYPE_ID;
+ timelib_sll utc_offset; // TIMELIB_ZONETYPE_OFFSET
+ struct // TIMELIB_ZONETYPE_ABBR
+ {
+ timelib_sll utc_offset;
+ char*abbr;
+ int dst;
+ } z;
+ } tzi;
};
#define DATE_SET_CONTEXT \
@@ -928,7 +938,26 @@
);
break;
case 'T': length = date_spprintf(buffer, 32 TSRMLS_CC,
%s, localtime ? offset-abbr : GMT); break;
- case 'e': length = date_spprintf(buffer, 32 TSRMLS_CC,
%s, localtime ? t-tz_info-name : UTC); break;
+ case 'e': if (!localtime) {
+ length = date_spprintf(buffer,
32, %s, UTC);
+ } else {
+ switch (t-zone_type) {
+ case
TIMELIB_ZONETYPE_ID:
+ length =
date_spprintf(buffer, 32, %s, t-tz_info-name);
+ break;
+ case
TIMELIB_ZONETYPE_ABBR:
+ length =
date_spprintf(buffer, 32, %s, offset-abbr);
+ break;
+ case
TIMELIB_ZONETYPE_OFFSET:
+ length =
date_spprintf(buffer, 32, %c%02d:%02d,
+
((offset-offset 0) ? '-' : '+'),
+
abs(offset-offset / 3600),
+
abs((offset-offset % 3600) / 60)
+
);
+ break;
+ }
+ }
+ break;
case 'Z': length = date_spprintf(buffer, 32 TSRMLS_CC,
%d, localtime ? offset-offset : 0); break;
/* full date/time */
@@ -1221,7 +1250,7 @@
now = timelib_time_ctor();
initial_ts = emalloc(25);
- snprintf(initial_ts, 24, @%ld, preset_ts);
+ snprintf(initial_ts, 24, @%ld UTC, preset_ts);
t = timelib_strtotime(initial_ts, strlen(initial_ts), NULL,
DATE_TIMEZONEDB); /* we ignore the error here, as this should never fail */
timelib_update_ts(t, tzi);
now-tz_info = tzi;
@@ -1732,7 +1761,20 @@
zend_object_value new_ov = date_object_new_timezone_ex(old_obj-std.ce,
new_obj TSRMLS_CC);
zend_objects_clone_members(new_obj-std, new_ov, old_obj-std,
Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
- new_obj-tz = old_obj-tz;
+ new_obj-type = old_obj-type;
+ switch (new_obj-type) {
+ case TIMELIB_ZONETYPE_ID:
+ new_obj-tzi.tz = old_obj-tzi.tz;
+ break;
+ case TIMELIB_ZONETYPE_OFFSET:
+
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug43003.phpt
derick Thu Jan 17 19:58:24 2008 UTC
Added files:
/php-src/ext/date/tests bug43003.phpt
Modified files:
/php-src/ext/date php_date.c
Log:
- Fixed bug #43003 (Invalid timezone reported for DateTime objects constructed
using a timestamp).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.154r2=1.155diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.154 php-src/ext/date/php_date.c:1.155
--- php-src/ext/date/php_date.c:1.154 Thu Jan 17 18:48:43 2008
+++ php-src/ext/date/php_date.c Thu Jan 17 19:58:24 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.154 2008/01/17 18:48:43 derick Exp $ */
+/* $Id: php_date.c,v 1.155 2008/01/17 19:58:24 derick Exp $ */
#include php.h
#include php_streams.h
@@ -276,6 +276,7 @@
struct _php_timezone_obj {
zend_object std;
+ int initialized;
int type;
union {
timelib_tzinfo *tz; // TIMELIB_ZONETYPE_ID;
@@ -1762,6 +1763,7 @@
zend_objects_clone_members(new_obj-std, new_ov, old_obj-std,
Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
new_obj-type = old_obj-type;
+ new_obj-initialized = 1;
switch (new_obj-type) {
case TIMELIB_ZONETYPE_ID:
new_obj-tzi.tz = old_obj-tzi.tz;
@@ -2210,6 +2212,7 @@
if (dateobj-time-is_localtime/* dateobj-time-tz_info*/) {
date_instantiate(date_ce_timezone, return_value TSRMLS_CC);
tzobj = (php_timezone_obj *)
zend_object_store_get_object(return_value TSRMLS_CC);
+ tzobj-initialized = 1;
tzobj-type = dateobj-time-zone_type;
switch (dateobj-time-zone_type) {
case TIMELIB_ZONETYPE_ID:
@@ -2435,6 +2438,7 @@
tzobj = zend_object_store_get_object(getThis()
TSRMLS_CC);
tzobj-type = TIMELIB_ZONETYPE_ID;
tzobj-tzi.tz = tzi;
+ tzobj-initialized = 1;
} else {
ZVAL_NULL(getThis());
}
@@ -2455,7 +2459,7 @@
RETURN_FALSE;
}
tzobj = (php_timezone_obj *) zend_object_store_get_object(object
TSRMLS_CC);
- DATE_CHECK_INITIALIZED(tzobj-tzi.tz, DateTimeZone);
+ DATE_CHECK_INITIALIZED(tzobj-initialized, DateTimeZone);
switch (tzobj-type) {
case TIMELIB_ZONETYPE_ID:
@@ -2518,7 +2522,7 @@
RETURN_FALSE;
}
tzobj = (php_timezone_obj *) zend_object_store_get_object(object
TSRMLS_CC);
- DATE_CHECK_INITIALIZED(tzobj-tzi.tz, DateTimeZone);
+ DATE_CHECK_INITIALIZED(tzobj-initialized, DateTimeZone);
dateobj = (php_date_obj *) zend_object_store_get_object(dateobject
TSRMLS_CC);
DATE_CHECK_INITIALIZED(dateobj-time, DateTime);
@@ -2541,7 +2545,7 @@
RETURN_FALSE;
}
tzobj = (php_timezone_obj *) zend_object_store_get_object(object
TSRMLS_CC);
- DATE_CHECK_INITIALIZED(tzobj-tzi.tz, DateTimeZone);
+ DATE_CHECK_INITIALIZED(tzobj-initialized, DateTimeZone);
if (tzobj-type != TIMELIB_ZONETYPE_ID) {
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43003.phpt?view=markuprev=1.1
Index: php-src/ext/date/tests/bug43003.phpt
+++ php-src/ext/date/tests/bug43003.phpt
--TEST--
Bug #43003 (Invalid timezone reported for DateTime objects constructed using a
timestamp)
--FILE--
?php
$oDateTest = new DateTime(@0, new DateTimeZone(date_default_timezone_get()));
echo $oDateTest-getTimezone()-getName().: . $oDateTest-format(Y-m-d
H:i:s).\n;
$oDateTest-setTimezone(new DateTimeZone(UTC));
echo $oDateTest-getTimezone()-getName().: . $oDateTest-format(Y-m-d
H:i:s).\n;
$oDateTest-setTimezone(new DateTimeZone(date_default_timezone_get()));
echo $oDateTest-getTimezone()-getName().: . $oDateTest-format(Y-m-d
H:i:s).\n;
$oDateTest = new DateTime(@0);
echo $oDateTest-getTimezone()-getName().: . $oDateTest-format(Y-m-d
H:i:s).\n;
$oDateTest-setTimezone( new DateTimeZone(date_default_timezone_get()));
echo $oDateTest-getTimezone()-getName().: . $oDateTest-format(Y-m-d
H:i:s).\n;
?
--EXPECT--
+00:00: 1970-01-01 00:00:00
UTC: 1970-01-01 00:00:00
Europe/Oslo: 1970-01-01 01:00:00
+00:00: 1970-01-01 00:00:00
Europe/Oslo: 1970-01-01 01:00:00
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/date php_date.c /ext/date/tests bug43808.phpt
derick Thu Jan 17 20:35:02 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug43808.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date php_date.c
Log:
- MFH: Fixed bug #43808 (date_create never fails (even when it should)).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.74r2=1.2027.2.547.2.965.2.75diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.74
php-src/NEWS:1.2027.2.547.2.965.2.75
--- php-src/NEWS:1.2027.2.547.2.965.2.74Thu Jan 17 19:58:59 2008
+++ php-src/NEWSThu Jan 17 20:35:01 2008
@@ -77,6 +77,7 @@
- Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
+- Fixed bug #43808 (date_create never fails (even when it should)). (Derick)
- Fixed bug #43527 (DateTime created from a timestamp reports environment
timezone). (Derick)
- Fixed bug #43003 (Invalid timezone reported for DateTime objects constructed
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.10r2=1.43.2.45.2.51.2.11diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.10
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.11
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.10 Thu Jan 17 19:59:00 2008
+++ php-src/ext/date/php_date.c Thu Jan 17 20:35:01 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.10 2008/01/17 19:59:00 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.11 2008/01/17 20:35:01 derick Exp $ */
#include php.h
#include php_streams.h
@@ -1702,7 +1702,7 @@
DATEG(last_errors) = last_errors;
}
-static void date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,
int time_str_len, char *format, zval *timezone_object TSRMLS_DC)
+static int date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,
int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC)
{
timelib_time *now;
timelib_tzinfo *tzi;
@@ -1726,6 +1726,16 @@
// update last errors and warnings
update_errors_warnings(err TSRMLS_CC);
+
+ if (ctor err err-error_count) {
+ /* spit out the first library error message, at least */
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to parse
time string (%s) at position %d (%c): %s, time_str,
+ err-error_messages[0].position,
err-error_messages[0].character, err-error_messages[0].message);
+ }
+ if (err err-error_count) {
+ return 0;
+ }
+
if (timezone_object) {
php_timezone_obj *tzobj;
@@ -1780,7 +1790,9 @@
if (free_tzi) {
timelib_tzinfo_dtor(tzi);
}
- timelib_time_dtor(now);
+ timelib_time_dtor(now);
+
+ return 1;
}
/* {{{ proto DateTime date_create([string time[, DateTimeZone object]])
@@ -1797,7 +1809,9 @@
}
date_instantiate(date_ce_date, return_value TSRMLS_CC);
- date_initialize(zend_object_store_get_object(return_value TSRMLS_CC),
time_str, time_str_len, NULL, timezone_object TSRMLS_CC);
+ if (!date_initialize(zend_object_store_get_object(return_value
TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
}
/* }}} */
@@ -1815,7 +1829,9 @@
}
date_instantiate(date_ce_date, return_value TSRMLS_CC);
- date_initialize(zend_object_store_get_object(return_value TSRMLS_CC),
time_str, time_str_len, format_str, timezone_object TSRMLS_CC);
+ if (!date_initialize(zend_object_store_get_object(return_value
TSRMLS_CC), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
}
/* }}} */
@@ -1830,7 +1846,7 @@
php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sO,
time_str, time_str_len, timezone_object, date_ce_timezone)) {
- date_initialize(zend_object_store_get_object(getThis()
TSRMLS_CC), time_str, time_str_len, NULL, timezone_object TSRMLS_CC);
+ date_initialize(zend_object_store_get_object(getThis()
TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43808.phpt?view=markuprev=1.1
Index: php-src/ext/date/tests/bug43808.phpt
+++ php-src/ext/date/tests/bug43808.phpt
--TEST--
Bug #43808 (date_create never fails (even when it should))
--FILE--
?php
$date = date_create('asdfasdf');
if ($date instanceof DateTime) {
echo this is wrong, should be bool;
}
var_dump( $date );
var_dump( DateTime::getLastErrors() );
var_dump( date_get_last_errors() );
?
--EXPECT--
bool(false)
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/date/lib parse_date.c parse_date.re /ext/date/tests bug43075.phpt
derick Thu Jan 17 20:45:17 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug43075.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date/lib parse_date.c parse_date.re
Log:
- MFH: Fixed bug #43075 (Support 2007-11-01T24:00:00+00:00).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.75r2=1.2027.2.547.2.965.2.76diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.75
php-src/NEWS:1.2027.2.547.2.965.2.76
--- php-src/NEWS:1.2027.2.547.2.965.2.75Thu Jan 17 20:35:01 2008
+++ php-src/NEWSThu Jan 17 20:44:53 2008
@@ -80,6 +80,7 @@
- Fixed bug #43808 (date_create never fails (even when it should)). (Derick)
- Fixed bug #43527 (DateTime created from a timestamp reports environment
timezone). (Derick)
+- Fixed bug #43075 (Support 2007-11-01T24:00:00+00:00). (Derick)
- Fixed bug #43003 (Invalid timezone reported for DateTime objects constructed
using a timestamp). (Derick)
- Fixed bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.2r2=1.29.2.30.2.14.2.3diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.2
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.3
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.2Thu Jan 17
18:49:31 2008
+++ php-src/ext/date/lib/parse_date.c Thu Jan 17 20:44:54 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Thu Jan 17 09:50:31 2008 */
+/* Generated by re2c 0.12.1 on Thu Jan 17 21:36:33 2008 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.29.2.30.2.14.2.2 2008/01/17 18:49:31 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.14.2.3 2008/01/17 20:44:54 derick Exp $ */
#include timelib.h
@@ -1451,8 +1451,8 @@
case '0':
case '1':
case '2':
- case '3': goto yy1238;
- case '4':
+ case '3':
+ case '4': goto yy1238;
case '5':
case '6':
case '7':
@@ -5548,7 +5548,7 @@
if(yych == '.') goto yy371;
goto yy308;
} else {
- if(yych = '3') goto yy403;
+ if(yych = '4') goto yy403;
if(yych = '9') goto yy400;
if(yych = ':') goto yy371;
goto yy308;
@@ -5630,7 +5630,7 @@
if(yych == '.') goto yy330;
goto yy53;
} else {
- if(yych = '3') goto yy329;
+ if(yych = '4') goto yy329;
if(yych == ':') goto yy330;
goto yy53;
}
@@ -6013,7 +6013,7 @@
yych = *++YYCURSOR;
if(yych = '5') {
if(yych = '/') goto yy332;
- if(yych = '4') goto yy365;
+ if(yych = '5') goto yy365;
} else {
if(yych = '9') goto yy337;
if(yych = ':') goto yy364;
@@ -6073,7 +6073,7 @@
if(yych == '.') goto yy371;
goto yy308;
} else {
- if(yych = '3') goto yy398;
+ if(yych = '4') goto yy398;
if(yych = '9') goto yy370;
if(yych = ':') goto yy371;
goto yy308;
@@ -6633,7 +6633,7 @@
if(yych == '.') goto yy371;
goto yy308;
} else {
- if(yych = '3') goto yy413;
+ if(yych = '4') goto yy413;
if(yych = '9') goto yy412;
if(yych = ':') goto yy371;
goto yy308;
@@ -6714,7 +6714,7 @@
if(yych == '.') goto yy420;
goto yy308;
} else {
- if(yych = '3') goto yy434;
+ if(yych = '4') goto yy434;
if(yych = '9') goto yy433;
if(yych = ':') goto yy420;
goto yy308;
@@ -7210,7 +7210,7 @@
if(yych == '.') goto yy447;
goto yy308;
} else {
- if(yych = '3') goto yy458;
+ if(yych = '4') goto yy458;
if(yych = '9') goto yy457;
if(yych = ':') goto yy447;
goto yy308;
@@
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re /ext/date/tests bug43075.phpt
derick Thu Jan 17 20:43:58 2008 UTC
Added files:
/php-src/ext/date/tests bug43075.phpt
Modified files:
/php-src/ext/date/lib parse_date.c parse_date.re
Log:
- Fixed bug #43075 (Support 2007-11-01T24:00:00+00:00).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.75r2=1.76diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.75
php-src/ext/date/lib/parse_date.c:1.76
--- php-src/ext/date/lib/parse_date.c:1.75 Sun Jan 13 15:16:47 2008
+++ php-src/ext/date/lib/parse_date.c Thu Jan 17 20:43:58 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Sun Jan 13 15:57:11 2008 */
+/* Generated by re2c 0.12.1 on Thu Jan 17 21:42:37 2008 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.75 2008/01/13 15:16:47 derick Exp $ */
+/* $Id: parse_date.c,v 1.76 2008/01/17 20:43:58 derick Exp $ */
#include timelib.h
@@ -1451,8 +1451,8 @@
case '0':
case '1':
case '2':
- case '3': goto yy1238;
- case '4':
+ case '3':
+ case '4': goto yy1238;
case '5':
case '6':
case '7':
@@ -5548,7 +5548,7 @@
if(yych == '.') goto yy371;
goto yy308;
} else {
- if(yych = '3') goto yy403;
+ if(yych = '4') goto yy403;
if(yych = '9') goto yy400;
if(yych = ':') goto yy371;
goto yy308;
@@ -5630,7 +5630,7 @@
if(yych == '.') goto yy330;
goto yy53;
} else {
- if(yych = '3') goto yy329;
+ if(yych = '4') goto yy329;
if(yych == ':') goto yy330;
goto yy53;
}
@@ -6013,7 +6013,7 @@
yych = *++YYCURSOR;
if(yych = '5') {
if(yych = '/') goto yy332;
- if(yych = '4') goto yy365;
+ if(yych = '5') goto yy365;
} else {
if(yych = '9') goto yy337;
if(yych = ':') goto yy364;
@@ -6073,7 +6073,7 @@
if(yych == '.') goto yy371;
goto yy308;
} else {
- if(yych = '3') goto yy398;
+ if(yych = '4') goto yy398;
if(yych = '9') goto yy370;
if(yych = ':') goto yy371;
goto yy308;
@@ -6633,7 +6633,7 @@
if(yych == '.') goto yy371;
goto yy308;
} else {
- if(yych = '3') goto yy413;
+ if(yych = '4') goto yy413;
if(yych = '9') goto yy412;
if(yych = ':') goto yy371;
goto yy308;
@@ -6714,7 +6714,7 @@
if(yych == '.') goto yy420;
goto yy308;
} else {
- if(yych = '3') goto yy434;
+ if(yych = '4') goto yy434;
if(yych = '9') goto yy433;
if(yych = ':') goto yy420;
goto yy308;
@@ -7210,7 +7210,7 @@
if(yych == '.') goto yy447;
goto yy308;
} else {
- if(yych = '3') goto yy458;
+ if(yych = '4') goto yy458;
if(yych = '9') goto yy457;
if(yych = ':') goto yy447;
goto yy308;
@@ -11893,7 +11893,7 @@
if(yych = 0x1F) goto yy3;
goto yy57;
} else {
- if(yych = '3') {
+ if(yych = '4') {
if(yych = '/') goto yy3;
goto yy662;
} else {
@@ -15000,7 +15000,7 @@
YYDEBUG(874, *YYCURSOR);
yych = *++YYCURSOR;
if(yych = '/') goto yy53;
- if(yych = '4') goto yy53;
+ if(yych = '5') goto yy53;
yy875:
YYDEBUG(875, *YYCURSOR);
yych = *++YYCURSOR;
@@ -15095,7 +15095,7 @@
yych = *++YYCURSOR;
if(yych = '5') {
if(yych = '/') goto yy887;
-
[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug43808.phpt
derick Thu Jan 17 20:34:17 2008 UTC
Added files:
/php-src/ext/date/tests bug43808.phpt
Modified files:
/php-src/ext/date php_date.c
Log:
- Fixed bug #43808 (date_create never fails (even when it should)).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.155r2=1.156diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.155 php-src/ext/date/php_date.c:1.156
--- php-src/ext/date/php_date.c:1.155 Thu Jan 17 19:58:24 2008
+++ php-src/ext/date/php_date.c Thu Jan 17 20:34:17 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.155 2008/01/17 19:58:24 derick Exp $ */
+/* $Id: php_date.c,v 1.156 2008/01/17 20:34:17 derick Exp $ */
#include php.h
#include php_streams.h
@@ -1832,7 +1832,7 @@
DATEG(last_errors) = last_errors;
}
-static void date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,
int time_str_len, char *format, zval *timezone_object TSRMLS_DC)
+static int date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,
int time_str_len, char *format, zval *timezone_object, int ctor TSRMLS_DC)
{
timelib_time *now;
timelib_tzinfo *tzi;
@@ -1856,6 +1856,16 @@
// update last errors and warnings
update_errors_warnings(err TSRMLS_CC);
+
+ if (ctor err err-error_count) {
+ /* spit out the first library error message, at least */
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed to parse
time string (%s) at position %d (%c): %s, time_str,
+ err-error_messages[0].position,
err-error_messages[0].character, err-error_messages[0].message);
+ }
+ if (err err-error_count) {
+ return 0;
+ }
+
if (timezone_object) {
php_timezone_obj *tzobj;
@@ -1910,7 +1920,9 @@
if (free_tzi) {
timelib_tzinfo_dtor(tzi);
}
- timelib_time_dtor(now);
+ timelib_time_dtor(now);
+
+ return 1;
}
/* {{{ proto DateTime date_create([string time[, DateTimeZone object]])
@@ -1927,7 +1939,9 @@
}
date_instantiate(date_ce_date, return_value TSRMLS_CC);
- date_initialize(zend_object_store_get_object(return_value TSRMLS_CC),
time_str, time_str_len, NULL, timezone_object TSRMLS_CC);
+ if (!date_initialize(zend_object_store_get_object(return_value
TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
}
/* }}} */
@@ -1945,7 +1959,9 @@
}
date_instantiate(date_ce_date, return_value TSRMLS_CC);
- date_initialize(zend_object_store_get_object(return_value TSRMLS_CC),
time_str, time_str_len, format_str, timezone_object TSRMLS_CC);
+ if (!date_initialize(zend_object_store_get_object(return_value
TSRMLS_CC), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
}
/* }}} */
@@ -1960,7 +1976,7 @@
php_set_error_handling(EH_THROW, NULL TSRMLS_CC);
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sO,
time_str, time_str_len, timezone_object, date_ce_timezone)) {
- date_initialize(zend_object_store_get_object(getThis()
TSRMLS_CC), time_str, time_str_len, NULL, timezone_object TSRMLS_CC);
+ date_initialize(zend_object_store_get_object(getThis()
TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC);
}
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43808.phpt?view=markuprev=1.1
Index: php-src/ext/date/tests/bug43808.phpt
+++ php-src/ext/date/tests/bug43808.phpt
--TEST--
Bug #43808 (date_create never fails (even when it should))
--FILE--
?php
$date = date_create('asdfasdf');
if ($date instanceof DateTime) {
echo this is wrong, should be bool;
}
var_dump( $date );
var_dump( DateTime::getLastErrors() );
var_dump( date_get_last_errors() );
?
--EXPECT--
bool(false)
array(4) {
[warning_count]=
int(1)
[warnings]=
array(1) {
[6]=
string(29) Double timezone specification
}
[error_count]=
int(1)
[errors]=
array(1) {
[0]=
string(47) The timezone could not be found in the database
}
}
array(4) {
[warning_count]=
int(1)
[warnings]=
array(1) {
[6]=
string(29) Double timezone specification
}
[error_count]=
int(1)
[errors]=
array(1) {
[0]=
string(47) The timezone could not be found in the database
}
}
--UEXPECT--
bool(false)
array(4) {
[uwarning_count]=
int(1)
[uwarnings]=
array(1) {
[6]=
string(29) Double timezone specification
}
[uerror_count]=
int(1)
[uerrors]=
array(1) {
[0]=
string(47) The timezone could not be found in the database
}
}
array(4) {
[uwarning_count]=
int(1)
[PHP-CVS] cvs: php-src /ext/date/lib tm2unixtime.c /ext/date/tests bug41599.phpt
derick Thu Jan 17 20:58:27 2008 UTC
Added files:
/php-src/ext/date/tests bug41599.phpt
Modified files:
/php-src/ext/date/lib tm2unixtime.c
Log:
- Fixed bug #41599 (setTime() fails after modify() is used).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/tm2unixtime.c?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/date/lib/tm2unixtime.c
diff -u php-src/ext/date/lib/tm2unixtime.c:1.19
php-src/ext/date/lib/tm2unixtime.c:1.20
--- php-src/ext/date/lib/tm2unixtime.c:1.19 Mon Dec 31 07:12:08 2007
+++ php-src/ext/date/lib/tm2unixtime.c Thu Jan 17 20:58:26 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tm2unixtime.c,v 1.19 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: tm2unixtime.c,v 1.20 2008/01/17 20:58:26 derick Exp $ */
#include timelib.h
@@ -98,6 +98,7 @@
} else {
time-d -= (7 - (abs(time-relative.weekday) - current_dow));
}
+ time-have_weekday_relative = 0;
}
static void do_normalize(timelib_time* time)
@@ -130,6 +131,7 @@
do_normalize(time);
memset((time-relative), 0, sizeof(time-relative));
+ time-have_relative = 0;
}
static void do_adjust_special_weekday(timelib_time* time)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug41599.phpt?view=markuprev=1.1
Index: php-src/ext/date/tests/bug41599.phpt
+++ php-src/ext/date/tests/bug41599.phpt
--TEST--
Bug #41599 (setTime() fails after modify() is used)
--FILE--
?php
date_default_timezone_set('Europe/London');
$start = new DateTime('2008-01-17 last Monday');
echo $start-format('Y-m-d H:i:s'),PHP_EOL;
//good
$start-modify('Tuesday');
echo $start-format('Y-m-d H:i:s'),PHP_EOL;
//good
$start-setTime(4, 0, 0);
echo $start-format('Y-m-d H:i:s'),PHP_EOL;
//jumped to next Sunday
$start-setTime(8, 0, 0);
echo $start-format('Y-m-d H:i:s'),PHP_EOL;
//jumped to next Sunday again
?
--EXPECT--
2008-01-14 00:00:00
2008-01-15 00:00:00
2008-01-15 04:00:00
2008-01-15 08:00:00
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build confutils.js
cellog Thu Jan 17 21:17:30 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/win32/buildconfutils.js
Log:
MFH: add errors when missing dependencies (Steph)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.9r2=1.60.2.1.2.10diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.9
php-src/win32/build/confutils.js:1.60.2.1.2.10
--- php-src/win32/build/confutils.js:1.60.2.1.2.9 Wed Nov 14 19:48:57 2007
+++ php-src/win32/build/confutils.jsThu Jan 17 21:17:29 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.9 2007/11/14 19:48:57 auroraeosrose Exp $
+// $Id: confutils.js,v 1.60.2.1.2.10 2008/01/17 21:17:29 cellog Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1009,6 +1009,14 @@
ADD_FLAG(LDFLAGS_ + EXT, /libpath:$(BUILD_DIR));
ADD_FLAG(LIBS_ + EXT, php_ + dependson + .lib);
ADD_FLAG(DEPS_ + EXT, $(BUILD_DIR)\\php_ + dependson +
.lib);
+ } else {
+ if (dep_present == no) {
+ if (ext_shared) {
+ WARNING(extname + has a missing dependency:
+ dependson);
+ } else {
+ ERROR(Cannot build + extname + ; +
dependson + not enabled);
+ }
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard dns.c
No commit to 5_2 ?
On 17.01.2008 17:12, Ilia Alshanetsky wrote:
iliaa Thu Jan 17 14:12:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
Fixed bug #43871 (crash inside dns_get_record)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.3r2=1.70.2.7.2.5.2.4diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.3
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.4
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.3 Mon Dec 31 07:17:14 2007
+++ php-src/ext/standard/dns.cThu Jan 17 14:12:12 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.3 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.4 2008/01/17 14:12:12 iliaa Exp $ */
/* {{{ includes */
#include php.h
@@ -654,7 +654,7 @@
char *hostname;
int hostname_len;
long type_param = PHP_DNS_ANY;
- zval *authns, *addtl;
+ zval *authns = NULL, *addtl = NULL;
int addtl_recs = 0;
int type_to_fetch;
struct __res_state res;
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip Makefile.frag config.m4
cellog Fri Jan 18 00:30:10 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/zipMakefile.frag Modified files: /php-src/ext/zipconfig.m4 Log: MFPECL: install headers http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.3r2=1.8.2.3.2.1diff_format=u Index: php-src/ext/zip/config.m4 diff -u php-src/ext/zip/config.m4:1.8.2.3 php-src/ext/zip/config.m4:1.8.2.3.2.1 --- php-src/ext/zip/config.m4:1.8.2.3 Tue Jul 3 17:25:35 2007 +++ php-src/ext/zip/config.m4 Fri Jan 18 00:30:10 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.3 2007/07/03 17:25:35 sniper Exp $ +dnl $Id: config.m4,v 1.8.2.3.2.1 2008/01/18 00:30:10 cellog Exp $ dnl PHP_ARG_ENABLE(zip, for zip archive read/writesupport, @@ -66,4 +66,12 @@ PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared) PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) PHP_SUBST(ZIP_SHARED_LIBADD) + ifdef([PHP_INSTALL_HEADERS], + [ + dnl Sadly, this is a complete NOP for pecl extensions + PHP_INSTALL_HEADERS(ext/zip/lib, [lib/zip.h lib/zipint.h lib/zip_alias.h lib/zipint_alias.h]) + ]) + + dnl so we always include the known-good working hack. + PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/zip/Makefile.frag?view=markuprev=1.1 Index: php-src/ext/zip/Makefile.frag +++ php-src/ext/zip/Makefile.frag -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip Makefile.frag config.m4 php_zip.c
cellog Fri Jan 18 00:31:23 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/zipMakefile.frag Modified files: /php-src/ext/zipconfig.m4 php_zip.c Log: MF5.3: install headers, use correct zip version http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.3r2=1.8.2.4diff_format=u Index: php-src/ext/zip/config.m4 diff -u php-src/ext/zip/config.m4:1.8.2.3 php-src/ext/zip/config.m4:1.8.2.4 --- php-src/ext/zip/config.m4:1.8.2.3 Tue Jul 3 17:25:35 2007 +++ php-src/ext/zip/config.m4 Fri Jan 18 00:31:23 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.3 2007/07/03 17:25:35 sniper Exp $ +dnl $Id: config.m4,v 1.8.2.4 2008/01/18 00:31:23 cellog Exp $ dnl PHP_ARG_ENABLE(zip, for zip archive read/writesupport, @@ -66,4 +66,12 @@ PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared) PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) PHP_SUBST(ZIP_SHARED_LIBADD) + ifdef([PHP_INSTALL_HEADERS], + [ + dnl Sadly, this is a complete NOP for pecl extensions + PHP_INSTALL_HEADERS(ext/zip/lib, [lib/zip.h lib/zipint.h lib/zip_alias.h lib/zipint_alias.h]) + ]) + + dnl so we always include the known-good working hack. + PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.41r2=1.1.2.42diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.1.2.41 php-src/ext/zip/php_zip.c:1.1.2.42 --- php-src/ext/zip/php_zip.c:1.1.2.41 Mon Jan 14 03:19:41 2008 +++ php-src/ext/zip/php_zip.c Fri Jan 18 00:31:23 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_zip.c,v 1.1.2.41 2008/01/14 03:19:41 cellog Exp $ */ +/* $Id: php_zip.c,v 1.1.2.42 2008/01/18 00:31:23 cellog Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -654,7 +654,7 @@ NULL, NULL, PHP_MINFO(zip), - 1.4.0, + 2.0.0, STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -2111,7 +2111,7 @@ php_info_print_table_start(); php_info_print_table_row(2, Zip, enabled); - php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.1.2.41 2008/01/14 03:19:41 cellog Exp $); + php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.1.2.42 2008/01/18 00:31:23 cellog Exp $); php_info_print_table_row(2, Zip version, 2.0.0); php_info_print_table_row(2, Libzip version, 0.7.1); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/Makefile.frag?view=markuprev=1.1 Index: php-src/ext/zip/Makefile.frag +++ php-src/ext/zip/Makefile.frag -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip Makefile.frag config.m4 php_zip.c
cellog Fri Jan 18 00:33:15 2008 UTC Modified files: /php-src/ext/zipMakefile.frag config.m4 php_zip.c Log: MF5.3: install headers, use correct zip version http://cvs.php.net/viewvc.cgi/php-src/ext/zip/Makefile.frag?r1=1.1r2=1.2diff_format=u Index: php-src/ext/zip/Makefile.frag diff -u /dev/null php-src/ext/zip/Makefile.frag:1.2 --- /dev/null Fri Jan 18 00:33:15 2008 +++ php-src/ext/zip/Makefile.frag Fri Jan 18 00:33:15 2008 @@ -0,0 +1,28 @@ +phpincludedir=$(prefix)/include/php + +ZIP_HEADER_FILES= \ + zip.h \ + zipint.h \ + zip_alias.h \ + zipint_alias.h + +install-zip-headers: + @echo Installing ZIP headers: $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib + @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib + @for f in $(ZIP_HEADER_FILES); do \ + if test -f $(top_srcdir)/lib/$$f; then \ + $(INSTALL_DATA) $(top_srcdir)/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + elif test -f $(top_builddir)/lib/$$f; then \ + $(INSTALL_DATA) $(top_builddir)/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + elif test -f $(top_srcdir)/ext/zip/lib/$$f; then \ + $(INSTALL_DATA) $(top_srcdir)/ext/zip/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + elif test -f $(top_builddir)/ext/zip/lib/$$f; then \ + $(INSTALL_DATA) $(top_builddir)/ext/zip/lib/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \ + else \ + echo hmmm; \ + fi \ + done; + +# mini hack +install: $(all_targets) $(install_targets) install-zip-headers + http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.11r2=1.12diff_format=u Index: php-src/ext/zip/config.m4 diff -u php-src/ext/zip/config.m4:1.11 php-src/ext/zip/config.m4:1.12 --- php-src/ext/zip/config.m4:1.11 Tue Jul 3 17:24:37 2007 +++ php-src/ext/zip/config.m4 Fri Jan 18 00:33:15 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2007/07/03 17:24:37 sniper Exp $ +dnl $Id: config.m4,v 1.12 2008/01/18 00:33:15 cellog Exp $ dnl PHP_ARG_ENABLE(zip, for zip archive read/writesupport, @@ -66,4 +66,12 @@ PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared) PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) PHP_SUBST(ZIP_SHARED_LIBADD) + ifdef([PHP_INSTALL_HEADERS], + [ + dnl Sadly, this is a complete NOP for pecl extensions + PHP_INSTALL_HEADERS(ext/zip/lib, [lib/zip.h lib/zipint.h lib/zip_alias.h lib/zipint_alias.h]) + ]) + + dnl so we always include the known-good working hack. + PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.55r2=1.56diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.55 php-src/ext/zip/php_zip.c:1.56 --- php-src/ext/zip/php_zip.c:1.55 Mon Jan 14 08:17:55 2008 +++ php-src/ext/zip/php_zip.c Fri Jan 18 00:33:15 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_zip.c,v 1.55 2008/01/14 08:17:55 tony2001 Exp $ */ +/* $Id: php_zip.c,v 1.56 2008/01/18 00:33:15 cellog Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -654,7 +654,7 @@ NULL, NULL, PHP_MINFO(zip), - 1.4.0, + 2.0.0, STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -2205,7 +2205,7 @@ php_info_print_table_start(); php_info_print_table_row(2, Zip, enabled); - php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.55 2008/01/14 08:17:55 tony2001 Exp $); + php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.56 2008/01/18 00:33:15 cellog Exp $); php_info_print_table_row(2, Zip version, 2.0.0); php_info_print_table_row(2, Libzip version, 0.7.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_3) / NEWS
nlopess Thu Jan 17 23:02:51 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: pcre 7.5 is in 5.2 branch as well http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.77r2=1.2027.2.547.2.965.2.78diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.77 php-src/NEWS:1.2027.2.547.2.965.2.78 --- php-src/NEWS:1.2027.2.547.2.965.2.77Thu Jan 17 20:59:10 2008 +++ php-src/NEWSThu Jan 17 23:02:50 2008 @@ -42,7 +42,6 @@ invoking the date parser. (Scott) - Removed the experimental RPL (master/slave) functions from mysqli. (Andrey) -- Upgraded PCRE to version 7.5 (Nuno) - Improved php.ini handling: (Jani) . Added .htaccess style user-defined php.ini files support for CGI/FastCGI -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard dns.c
The crash is in new code introduced into 5.3+, the 5.2 branch is not
affected by the bug.
On 17-Jan-08, at 4:25 PM, Antony Dovgal wrote:
No commit to 5_2 ?
On 17.01.2008 17:12, Ilia Alshanetsky wrote:
iliaa Thu Jan 17 14:12:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standarddns.c
Log:
Fixed bug #43871 (crash inside dns_get_record)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.3r2=1.70.2.7.2.5.2.4diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.3 php-src/ext/
standard/dns.c:1.70.2.7.2.5.2.4
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.3 Mon Dec 31 07:17:14
2007
+++ php-src/ext/standard/dns.c Thu Jan 17 14:12:12 2008
@@ -18,7 +18,7 @@
+
--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.3 2007/12/31 07:17:14 sebastian Exp
$ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.4 2008/01/17 14:12:12 iliaa Exp $ */
/* {{{ includes */
#include php.h
@@ -654,7 +654,7 @@
char *hostname;
int hostname_len;
long type_param = PHP_DNS_ANY;
- zval *authns, *addtl;
+ zval *authns = NULL, *addtl = NULL;
int addtl_recs = 0;
int type_to_fetch;
struct __res_state res;
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Ilia Alshanetsky
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip Makefile.frag config.m4
Exactly what are you trying to fix here? This is not PECL, this is core and it works fine here! --Jani Greg Beaver kirjoitti: cellog Fri Jan 18 00:30:10 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/zip Makefile.frag Modified files: /php-src/ext/zip config.m4 Log: MFPECL: install headers http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.3r2=1.8.2.3.2.1diff_format=u Index: php-src/ext/zip/config.m4 diff -u php-src/ext/zip/config.m4:1.8.2.3 php-src/ext/zip/config.m4:1.8.2.3.2.1 --- php-src/ext/zip/config.m4:1.8.2.3 Tue Jul 3 17:25:35 2007 +++ php-src/ext/zip/config.m4 Fri Jan 18 00:30:10 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.3 2007/07/03 17:25:35 sniper Exp $ +dnl $Id: config.m4,v 1.8.2.3.2.1 2008/01/18 00:30:10 cellog Exp $ dnl PHP_ARG_ENABLE(zip, for zip archive read/writesupport, @@ -66,4 +66,12 @@ PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared) PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) PHP_SUBST(ZIP_SHARED_LIBADD) + ifdef([PHP_INSTALL_HEADERS], + [ + dnl Sadly, this is a complete NOP for pecl extensions + PHP_INSTALL_HEADERS(ext/zip/lib, [lib/zip.h lib/zipint.h lib/zip_alias.h lib/zipint_alias.h]) + ]) + + dnl so we always include the known-good working hack. + PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/zip/Makefile.frag?view=markuprev=1.1 Index: php-src/ext/zip/Makefile.frag +++ php-src/ext/zip/Makefile.frag -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip php_zip.c php_zip.h
pajoye Fri Jan 18 01:11:27 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zipphp_zip.c php_zip.h
Log:
- MFB: reflect the correct version
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.7r2=1.1.2.38.2.8diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.7
php-src/ext/zip/php_zip.c:1.1.2.38.2.8
--- php-src/ext/zip/php_zip.c:1.1.2.38.2.7 Fri Jan 18 00:20:56 2008
+++ php-src/ext/zip/php_zip.c Fri Jan 18 01:11:26 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1.2.38.2.7 2008/01/18 00:20:56 cellog Exp $ */
+/* $Id: php_zip.c,v 1.1.2.38.2.8 2008/01/18 01:11:26 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2111,9 +2111,9 @@
php_info_print_table_start();
php_info_print_table_row(2, Zip, enabled);
- php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v
1.1.2.38.2.7 2008/01/18 00:20:56 cellog Exp $);
- php_info_print_table_row(2, Zip version, 2.0.0);
- php_info_print_table_row(2, Libzip version, 0.7.1);
+ php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v
1.1.2.38.2.8 2008/01/18 01:11:26 pajoye Exp $);
+ php_info_print_table_row(2, Zip version, PHP_ZIP_VERSION_STRING);
+ php_info_print_table_row(2, Libzip version, 0.8.0);
php_info_print_table_end();
}
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.h?r1=1.10.2.3.2.1r2=1.10.2.3.2.2diff_format=u
Index: php-src/ext/zip/php_zip.h
diff -u php-src/ext/zip/php_zip.h:1.10.2.3.2.1
php-src/ext/zip/php_zip.h:1.10.2.3.2.2
--- php-src/ext/zip/php_zip.h:1.10.2.3.2.1 Mon Dec 31 07:17:16 2007
+++ php-src/ext/zip/php_zip.h Fri Jan 18 01:11:26 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.h,v 1.10.2.3.2.1 2007/12/31 07:17:16 sebastian Exp $ */
+/* $Id: php_zip.h,v 1.10.2.3.2.2 2008/01/18 01:11:26 pajoye Exp $ */
#ifndef PHP_ZIP_H
#define PHP_ZIP_H
@@ -30,6 +30,8 @@
#include lib/zip.h
+#define PHP_ZIP_VERSION_STRING 1.8.11
+
/* {{{ OPENBASEDIR_CHECKPATH(filename) */
#if (PHP_MAJOR_VERSION 6)
#define OPENBASEDIR_CHECKPATH(filename) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip php_zip.c php_zip.h
pajoye Fri Jan 18 01:24:29 2008 UTC
Modified files:
/php-src/ext/zipphp_zip.c php_zip.h
Log:
- MFB: reflect the correct version
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.56r2=1.57diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.56 php-src/ext/zip/php_zip.c:1.57
--- php-src/ext/zip/php_zip.c:1.56 Fri Jan 18 00:33:15 2008
+++ php-src/ext/zip/php_zip.c Fri Jan 18 01:24:29 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.56 2008/01/18 00:33:15 cellog Exp $ */
+/* $Id: php_zip.c,v 1.57 2008/01/18 01:24:29 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2205,9 +2205,9 @@
php_info_print_table_start();
php_info_print_table_row(2, Zip, enabled);
- php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.56
2008/01/18 00:33:15 cellog Exp $);
- php_info_print_table_row(2, Zip version, 2.0.0);
- php_info_print_table_row(2, Libzip version, 0.7.1);
+ php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.57
2008/01/18 01:24:29 pajoye Exp $);
+ php_info_print_table_row(2, Zip version, PHP_ZIP_VERSION_STRING);
+ php_info_print_table_row(2, Libzip version, 0.8.0);
php_info_print_table_end();
}
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.h?r1=1.16r2=1.17diff_format=u
Index: php-src/ext/zip/php_zip.h
diff -u php-src/ext/zip/php_zip.h:1.16 php-src/ext/zip/php_zip.h:1.17
--- php-src/ext/zip/php_zip.h:1.16 Mon Dec 31 07:12:17 2007
+++ php-src/ext/zip/php_zip.h Fri Jan 18 01:24:29 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.h,v 1.16 2007/12/31 07:12:17 sebastian Exp $ */
+/* $Id: php_zip.h,v 1.17 2008/01/18 01:24:29 pajoye Exp $ */
#ifndef PHP_ZIP_H
#define PHP_ZIP_H
@@ -30,6 +30,8 @@
#include lib/zip.h
+#define PHP_ZIP_VERSION_STRING 1.8.11
+
/* {{{ OPENBASEDIR_CHECKPATH(filename) */
#if (PHP_MAJOR_VERSION 6)
#define OPENBASEDIR_CHECKPATH(filename) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip Makefile.frag config.m4
Jani Taskinen wrote: Exactly what are you trying to fix here? This is not PECL, this is core and it works fine here! This change installs 4 .h files so that libzip symbols are exported when the zip extension is installed. Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
