[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
moriyoshiThu, 21 Jul 2011 07:31:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313496 Log: - Show PHP_VERSION in the banner. Suggested by Chris and others. Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c U php/php-src/trunk/sapi/cli/php_cli_server.c Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c === --- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-21 03:41:21 UTC (rev 313495) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-21 07:31:29 UTC (rev 313496) @@ -2134,11 +2134,11 @@ gettimeofday(tv, NULL); php_localtime_r(tv.tv_sec, tm); php_asctime_r(tm, buf); - printf(PHP Development Server started at %s + printf(PHP %s Development Server started at %s Listening on %s\n Document root is %s\n Press Ctrl-C to quit.\n, - buf, server_bind_address, document_root); + PHP_VERSION, buf, server_bind_address, document_root); } #if defined(HAVE_SIGNAL_H) defined(SIGINT) Modified: php/php-src/trunk/sapi/cli/php_cli_server.c === --- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-21 03:41:21 UTC (rev 313495) +++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-21 07:31:29 UTC (rev 313496) @@ -2134,11 +2134,11 @@ gettimeofday(tv, NULL); php_localtime_r(tv.tv_sec, tm); php_asctime_r(tm, buf); - printf(PHP Development Server started at %s + printf(PHP %s Development Server started at %s Listening on %s\n Document root is %s\n Press Ctrl-C to quit.\n, - buf, server_bind_address, document_root); + PHP_VERSION, buf, server_bind_address, document_root); } #if defined(HAVE_SIGNAL_H) defined(SIGINT) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/snmp/ php_snmp.h snmp.c tests/snmp-object-properties.phpt
lytboris Thu, 21 Jul 2011 12:47:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313532
Log:
s/noOIDIncreasingCheck/oid_increasing_check/
Changed paths:
U php/php-src/trunk/ext/snmp/php_snmp.h
U php/php-src/trunk/ext/snmp/snmp.c
U php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt
Modified: php/php-src/trunk/ext/snmp/php_snmp.h
===
--- php/php-src/trunk/ext/snmp/php_snmp.h 2011-07-21 12:27:00 UTC (rev
313531)
+++ php/php-src/trunk/ext/snmp/php_snmp.h 2011-07-21 12:47:07 UTC (rev
313532)
@@ -93,7 +93,7 @@
int enum_print;
int oid_output_format;
int snmp_errno;
- int noOIDIncreasingCheck;
+ int oid_increasing_check;
char snmp_errstr[128];
} php_snmp_object;
Modified: php/php-src/trunk/ext/snmp/snmp.c
===
--- php/php-src/trunk/ext/snmp/snmp.c 2011-07-21 12:27:00 UTC (rev 313531)
+++ php/php-src/trunk/ext/snmp/snmp.c 2011-07-21 12:47:07 UTC (rev 313532)
@@ -376,7 +376,7 @@
long max_repetitions;
int valueretrieval;
int array_output;
- int noOIDIncreasingCheck;
+ int oid_increasing_check;
snmpobjarg *vars;
};
@@ -879,7 +879,7 @@
/* OID increase check */
if (st SNMP_CMD_WALK) {
- if
(objid_query-noOIDIncreasingCheck == FALSE snmp_oid_compare(name,
name_length, vars-name, vars-name_length) = 0) {
+ if
(objid_query-oid_increasing_check == TRUE snmp_oid_compare(name,
name_length, vars-name, vars-name_length) = 0) {
snprint_objid(buf2,
sizeof(buf2), vars-name, vars-name_length);
php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_NOT_INCREASING,
Error: OID not increasing: %s, buf2);
keepwalking = 0;
@@ -1332,7 +1332,7 @@
objid_query.max_repetitions = -1;
objid_query.non_repeaters = 0;
objid_query.valueretrieval = SNMP_G(valueretrieval);
- objid_query.noOIDIncreasingCheck = FALSE;
+ objid_query.oid_increasing_check = TRUE;
if (session_less_mode) {
if (version == SNMP_VERSION_3) {
@@ -1426,7 +1426,7 @@
objid_query.max_repetitions =
snmp_object-max_oids;
}
}
- objid_query.noOIDIncreasingCheck =
snmp_object-noOIDIncreasingCheck;
+ objid_query.oid_increasing_check =
snmp_object-oid_increasing_check;
objid_query.valueretrieval = snmp_object-valueretrieval;
glob_snmp_object.enum_print =
netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, snmp_object-enum_print);
@@ -1757,6 +1757,7 @@
snmp_object-enum_print = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
snmp_object-oid_output_format =
netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT);
snmp_object-quick_print =
netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT);
+ snmp_object-oid_increasing_check = TRUE;
}
/* }}} */
@@ -2118,7 +2119,7 @@
return SUCCESS; \
}
-PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(noOIDIncreasingCheck)
+PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(oid_increasing_check)
PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(quick_print)
PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(enum_print)
@@ -,7 +2223,7 @@
PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(quick_print)
PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(enum_print)
-PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(noOIDIncreasingCheck)
+PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(oid_increasing_check)
/* {{{ */
static int php_snmp_write_oid_output_format(php_snmp_object *snmp_object, zval
*newval TSRMLS_DC)
@@ -2284,7 +2285,7 @@
PHP_SNMP_PROPERTY_ENTRY_RECORD(quick_print),
PHP_SNMP_PROPERTY_ENTRY_RECORD(enum_print),
PHP_SNMP_PROPERTY_ENTRY_RECORD(oid_output_format),
- PHP_SNMP_PROPERTY_ENTRY_RECORD(noOIDIncreasingCheck),
+ PHP_SNMP_PROPERTY_ENTRY_RECORD(oid_increasing_check),
{ NULL, 0, NULL, NULL}
};
/* }}} */
Modified: php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt
===
--- php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt
2011-07-21 12:27:00 UTC (rev 313531)
+++ php/php-src/trunk/ext/snmp/tests/snmp-object-properties.phpt
2011-07-21 12:47:07 UTC (rev 313532)
@@
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/snmp/ php_snmp.h snmp.c tests/snmp-object-properties.phpt
lytboris Thu, 21 Jul 2011 12:48:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313533
Log:
s/noOIDIncreasingCheck/oid_increasing_check/
Changed paths:
_U php/php-src/branches/PHP_5_4/ext/snmp/
U php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h
U php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
U php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-properties.phpt
Property changes on: php/php-src/branches/PHP_5_4/ext/snmp
___
Modified: svn:mergeinfo
- /php/php-src/trunk/ext/snmp:284726,311033-313324,313341
+ /php/php-src/trunk/ext/snmp:284726,311033-313324,313341,313532
Modified: php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h
===
--- php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h2011-07-21 12:47:07 UTC
(rev 313532)
+++ php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h2011-07-21 12:48:47 UTC
(rev 313533)
@@ -93,7 +93,7 @@
int enum_print;
int oid_output_format;
int snmp_errno;
- int noOIDIncreasingCheck;
+ int oid_increasing_check;
char snmp_errstr[128];
} php_snmp_object;
Modified: php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
===
--- php/php-src/branches/PHP_5_4/ext/snmp/snmp.c2011-07-21 12:47:07 UTC
(rev 313532)
+++ php/php-src/branches/PHP_5_4/ext/snmp/snmp.c2011-07-21 12:48:47 UTC
(rev 313533)
@@ -368,7 +368,7 @@
long max_repetitions;
int valueretrieval;
int array_output;
- int noOIDIncreasingCheck;
+ int oid_increasing_check;
snmpobjarg *vars;
};
@@ -864,7 +864,7 @@
/* OID increase check */
if (st SNMP_CMD_WALK) {
- if
(objid_query-noOIDIncreasingCheck == FALSE snmp_oid_compare(name,
name_length, vars-name, vars-name_length) = 0) {
+ if
(objid_query-oid_increasing_check == TRUE snmp_oid_compare(name,
name_length, vars-name, vars-name_length) = 0) {
snprint_objid(buf2,
sizeof(buf2), vars-name, vars-name_length);
php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_NOT_INCREASING,
Error: OID not increasing: %s, buf2);
keepwalking = 0;
@@ -1317,7 +1317,7 @@
objid_query.max_repetitions = -1;
objid_query.non_repeaters = 0;
objid_query.valueretrieval = SNMP_G(valueretrieval);
- objid_query.noOIDIncreasingCheck = FALSE;
+ objid_query.oid_increasing_check = TRUE;
if (session_less_mode) {
if (version == SNMP_VERSION_3) {
@@ -1411,7 +1411,7 @@
objid_query.max_repetitions =
snmp_object-max_oids;
}
}
- objid_query.noOIDIncreasingCheck =
snmp_object-noOIDIncreasingCheck;
+ objid_query.oid_increasing_check =
snmp_object-oid_increasing_check;
objid_query.valueretrieval = snmp_object-valueretrieval;
glob_snmp_object.enum_print =
netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, snmp_object-enum_print);
@@ -1728,6 +1728,7 @@
snmp_object-enum_print = netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM);
snmp_object-oid_output_format =
netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT);
snmp_object-quick_print =
netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT);
+ snmp_object-oid_increasing_check = TRUE;
}
/* }}} */
@@ -2053,7 +2054,7 @@
return SUCCESS; \
}
-PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(noOIDIncreasingCheck)
+PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(oid_increasing_check)
PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(quick_print)
PHP_SNMP_BOOL_PROPERTY_READER_FUNCTION(enum_print)
@@ -2157,7 +2158,7 @@
PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(quick_print)
PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(enum_print)
-PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(noOIDIncreasingCheck)
+PHP_SNMP_BOOL_PROPERTY_WRITER_FUNCTION(oid_increasing_check)
/* {{{ */
static int php_snmp_write_oid_output_format(php_snmp_object *snmp_object, zval
*newval TSRMLS_DC)
@@ -2219,7 +2220,7 @@
PHP_SNMP_PROPERTY_ENTRY_RECORD(quick_print),
PHP_SNMP_PROPERTY_ENTRY_RECORD(enum_print),
PHP_SNMP_PROPERTY_ENTRY_RECORD(oid_output_format),
- PHP_SNMP_PROPERTY_ENTRY_RECORD(noOIDIncreasingCheck),
+
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/standard/info.c
pajoye Thu, 21 Jul 2011 14:49:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313538
Log:
- Fixed bug #55258 (Windows Version Detecting Error) (already fixed in
trunk/5.4)
Bug: https://bugs.php.net/55258 (Open) Windows Version Detecting Error
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/info.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-07-21 14:22:15 UTC (rev 313537)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-07-21 14:49:55 UTC (rev 313538)
@@ -16,6 +16,8 @@
- Core
. Removed warning when argument of is_a() or is_subclass_of() is not
a known class. (Stas)
+ . Fixed bug #55258 (Windows Version Detecting Error).
+( xiaomao5 at live dot com, Pierre)
. Fixed bug #55187 (readlink returns weird characters when false result).
(Pierre)
. Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/info.c2011-07-21 14:22:15 UTC
(rev 313537)
+++ php/php-src/branches/PHP_5_3/ext/standard/info.c2011-07-21 14:49:55 UTC
(rev 313538)
@@ -289,7 +289,7 @@
major = Windows Server 2008;
}
} else
- if ( osvi.dwMinorVersion == 2 ) {
+ if ( osvi.dwMinorVersion == 1 ) {
if( osvi.wProductType == VER_NT_WORKSTATION ) {
major = Windows 7;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/date/tests/ bug33532.phpt
danielc Thu, 21 Jul 2011 19:45:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313555 Log: Revert r311205. Test works in original form and should not vary between branches in this case. Changed paths: U php/php-src/trunk/ext/date/tests/bug33532.phpt Modified: php/php-src/trunk/ext/date/tests/bug33532.phpt === --- php/php-src/trunk/ext/date/tests/bug33532.phpt 2011-07-21 19:29:45 UTC (rev 313554) +++ php/php-src/trunk/ext/date/tests/bug33532.phpt 2011-07-21 19:45:18 UTC (rev 313555) @@ -29,10 +29,10 @@ TZ has NOT been set Should strftime==datestr? Strftime seems to assume GMT tStamp. input10:00:00 AM July 1 2005 -strftime 10:00:00 AM July 1 2005 UTC -0500 +strftime 10:00:00 AM July 1 2005 UTC + datestr 10:00:00 AM July 1 2005 UTC Setting TZ input10:00:00 AM July 1 2005 -strftime 10:00:00 AM July 1 2005 EST -0500 +strftime 10:00:00 AM July 1 2005 EST +1000 datestr 10:00:00 AM July 1 2005 EST -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type2.inc branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type3.inc branches/PHP_5_3/ext/date/tests/DateT
danielc Thu, 21 Jul 2011 19:56:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313556
Log:
Fix spelling error.
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type2.inc
U
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type3.inc
U
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type2.inc
U
php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type3.inc
U
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type2-type2.inc
U
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type2-type3.inc
U
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type3-type2.inc
U
php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type3-type3.inc
U php/php-src/trunk/ext/date/tests/DateTime_data-fall-type2-type2.inc
U php/php-src/trunk/ext/date/tests/DateTime_data-fall-type2-type3.inc
U php/php-src/trunk/ext/date/tests/DateTime_data-fall-type3-type2.inc
U php/php-src/trunk/ext/date/tests/DateTime_data-fall-type3-type3.inc
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type2.inc
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type2.inc 2011-07-21 19:45:18 UTC (rev 313555)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type2.inc 2011-07-21 19:56:54 UTC (rev 313556)
@@ -18,7 +18,7 @@
* + st: standard time on the transition day 2010-11-07 03:16:55 EST
* + post: the day after the transition day 2010-11-08 19:59:59 EST
* + dtsec: daylight time 1 sec before change 2010-11-07 01:59:59 EDT
- * + stsec: standard time first secodn2010-11-07 01:00:00 EST
+ * + stsec: standard time first second2010-11-07 01:00:00 EST
*/
echo test_time_fall_type2_prev_type2_prev: ;
$end = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type3.inc
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type3.inc 2011-07-21 19:45:18 UTC (rev 313555)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type2-type3.inc 2011-07-21 19:56:54 UTC (rev 313556)
@@ -18,7 +18,7 @@
* + st: standard time on the transition day 2010-11-07 03:16:55 EST
* + post: the day after the transition day 2010-11-08 19:59:59 EST
* + dtsec: daylight time 1 sec before change 2010-11-07 01:59:59 EDT
- * + stsec: standard time first secodn2010-11-07 01:00:00 EST
+ * + stsec: standard time first second2010-11-07 01:00:00 EST
*/
echo test_time_fall_type2_prev_type3_prev: ;
$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type2.inc
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type2.inc 2011-07-21 19:45:18 UTC (rev 313555)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type2.inc 2011-07-21 19:56:54 UTC (rev 313556)
@@ -18,7 +18,7 @@
* + st: standard time on the transition day 2010-11-07 03:16:55 EST
* + post: the day after the transition day 2010-11-08 19:59:59 EST
* + dtsec: daylight time 1 sec before change 2010-11-07 01:59:59 EDT
- * + stsec: standard time first secodn2010-11-07 01:00:00 EST
+ * + stsec: standard time first second2010-11-07 01:00:00 EST
*/
echo test_time_fall_type3_prev_type2_prev: ;
$end = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type3.inc
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type3.inc 2011-07-21 19:45:18 UTC (rev 313555)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-fall-type3-type3.inc 2011-07-21 19:56:54 UTC (rev 313556)
@@ -18,7 +18,7 @@
* + st: standard time on the transition day 2010-11-07 03:16:55
* + post: the day after the transition day 2010-11-08 19:59:59
* + dtsec: daylight time 1 sec before change 2010-11-07 01:59:59 EDT, + TZ
- * + stsec: standard time first secodn2010-11-07 01:00:00 EST, + TZ
+ * + stsec: standard time first second2010-11-07 01:00:00 EST, + TZ
*/
echo test_time_fall_type3_prev_type3_prev: ;
$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3
Modified: php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type2-type2.inc
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-fall-type2-type2.inc 2011-07-21
