derick Fri Apr 13 08:33:49 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/date/tests date_sun_info_002.phpt
Modified files:
/php-src NEWS
/php-src/ext/date php_date.c
/php-src/ext/date/tests date_sun_info_001.phpt
Log:
- Fixed bug #39965 (Latitude and longitude are backwards in date_sun_info()).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.642&r2=1.2027.2.547.2.643&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.642 php-src/NEWS:1.2027.2.547.2.643
--- php-src/NEWS:1.2027.2.547.2.642 Fri Apr 13 08:10:54 2007
+++ php-src/NEWS Fri Apr 13 08:33:48 2007
@@ -10,6 +10,8 @@
units correctly). (Derick)
- Fixed bug #40290 (strtotime() returns unexpected result with particular
timezone offset). (Derick)
+- Fixed bug #39965 (Latitude and longitude are backwards in date_sun_info()).
+ (Derick)
10 Apr 2007, PHP 5.2.2RC1
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.43&r2=1.43.2.45.2.44&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.43
php-src/ext/date/php_date.c:1.43.2.45.2.44
--- php-src/ext/date/php_date.c:1.43.2.45.2.43 Mon Mar 5 14:10:18 2007
+++ php-src/ext/date/php_date.c Fri Apr 13 08:33:48 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.43 2007/03/05 14:10:18 mike Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.44 2007/04/13 08:33:48 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2387,7 +2387,7 @@
array_init(return_value);
/* Get sun up/down and transit */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -35.0/60,
1, &ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -35.0/60,
1, &ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value, "sunrise", 0);
@@ -2407,7 +2407,7 @@
add_assoc_long(return_value, "transit", timelib_date_to_int(t2,
&dummy));
/* Get civil twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -6.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -6.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value, "civil_twilight_begin", 0);
@@ -2425,7 +2425,7 @@
}
/* Get nautical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -12.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -12.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value, "nautical_twilight_begin",
0);
@@ -2443,7 +2443,7 @@
}
/* Get astronomical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -18.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -18.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_assoc_bool(return_value,
"astronomical_twilight_begin", 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sun_info_001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/date/tests/date_sun_info_001.phpt
diff -u php-src/ext/date/tests/date_sun_info_001.phpt:1.1.2.2
php-src/ext/date/tests/date_sun_info_001.phpt:1.1.2.3
--- php-src/ext/date/tests/date_sun_info_001.phpt:1.1.2.2 Fri Dec 22
13:07:53 2006
+++ php-src/ext/date/tests/date_sun_info_001.phpt Fri Apr 13 08:33:48 2007
@@ -11,22 +11,22 @@
--EXPECTF--
array(9) {
["sunrise"]=>
- int(1165899133)
+ int(1165897782)
["sunset"]=>
- int(1165934481)
+ int(1165934168)
["transit"]=>
- int(1165916807)
+ int(1165915975)
["civil_twilight_begin"]=>
- int(1165897449)
+ int(1165896176)
["civil_twilight_end"]=>
- int(1165936165)
+ int(1165935773)
["nautical_twilight_begin"]=>
- int(1165895547)
+ int(1165894353)
["nautical_twilight_end"]=>
- int(1165938067)
+ int(1165937597)
["astronomical_twilight_begin"]=>
- int(1165893693)
+ int(1165892570)
["astronomical_twilight_end"]=>
- int(1165939921)
+ int(1165939380)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sun_info_002.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/date_sun_info_002.phpt
+++ php-src/ext/date/tests/date_sun_info_002.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
