[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_API.h branches/PHP_5_3/main/php.h branches/PHP_5_4/Zend/zend_API.h branches/PHP_5_4/main/php.h trunk/Zend/zend_API.h trunk/main/php.h
felipe Mon, 25 Jul 2011 11:30:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313662
Log:
- Added new macro to be used in the end of zend_function_entry declaration
(Gwynne)
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_API.h
U php/php-src/branches/PHP_5_3/main/php.h
U php/php-src/branches/PHP_5_4/Zend/zend_API.h
U php/php-src/branches/PHP_5_4/main/php.h
U php/php-src/trunk/Zend/zend_API.h
U php/php-src/trunk/main/php.h
Modified: php/php-src/branches/PHP_5_3/Zend/zend_API.h
===
--- php/php-src/branches/PHP_5_3/Zend/zend_API.h2011-07-25 11:07:55 UTC
(rev 313661)
+++ php/php-src/branches/PHP_5_3/Zend/zend_API.h2011-07-25 11:30:53 UTC
(rev 313662)
@@ -96,6 +96,8 @@
#define ZEND_NS_FALIAS(ns, name, alias, arg_info)
ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
#define ZEND_NS_DEP_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns,
name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED)
+#define ZEND_FE_END{ NULL, NULL, NULL, 0, 0 }
+
#define ZEND_ARG_INFO(pass_by_ref, name)
{ #name, sizeof(#name)-1, NULL, 0, 0, 0, pass_by_ref, 0, 0 },
#define ZEND_ARG_PASS_INFO(pass_by_ref)
{ NULL, 0, NULL, 0, 0, 0, pass_by_ref, 0, 0 },
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name,
sizeof(#name)-1, #classname, sizeof(#classname)-1, 0, allow_null, pass_by_ref,
0, 0 },
Modified: php/php-src/branches/PHP_5_3/main/php.h
===
--- php/php-src/branches/PHP_5_3/main/php.h 2011-07-25 11:07:55 UTC (rev
313661)
+++ php/php-src/branches/PHP_5_3/main/php.h 2011-07-25 11:30:53 UTC (rev
313662)
@@ -351,6 +351,7 @@
#define PHP_MALIAS ZEND_MALIAS
#define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME
#define PHP_ME_MAPPING ZEND_ME_MAPPING
+#define PHP_FE_END ZEND_FE_END
#define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N
#define PHP_MODULE_SHUTDOWN_N ZEND_MODULE_SHUTDOWN_N
Modified: php/php-src/branches/PHP_5_4/Zend/zend_API.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_API.h2011-07-25 11:07:55 UTC
(rev 313661)
+++ php/php-src/branches/PHP_5_4/Zend/zend_API.h2011-07-25 11:30:53 UTC
(rev 313662)
@@ -96,6 +96,8 @@
#define ZEND_NS_FALIAS(ns, name, alias, arg_info)
ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
#define ZEND_NS_DEP_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns,
name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED)
+#define ZEND_FE_END{ NULL, NULL, NULL, 0, 0 }
+
#define ZEND_ARG_INFO(pass_by_ref, name)
{ #name, sizeof(#name)-1, NULL, 0, 0, 0, pass_by_ref},
#define ZEND_ARG_PASS_INFO(pass_by_ref)
{ NULL, 0, NULL, 0, 0, 0, pass_by_ref},
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name,
sizeof(#name)-1, #classname, sizeof(#classname)-1, IS_OBJECT, allow_null,
pass_by_ref},
Modified: php/php-src/branches/PHP_5_4/main/php.h
===
--- php/php-src/branches/PHP_5_4/main/php.h 2011-07-25 11:07:55 UTC (rev
313661)
+++ php/php-src/branches/PHP_5_4/main/php.h 2011-07-25 11:30:53 UTC (rev
313662)
@@ -359,6 +359,7 @@
#define PHP_MALIAS ZEND_MALIAS
#define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME
#define PHP_ME_MAPPING ZEND_ME_MAPPING
+#define PHP_FE_END ZEND_FE_END
#define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N
#define PHP_MODULE_SHUTDOWN_N ZEND_MODULE_SHUTDOWN_N
Modified: php/php-src/trunk/Zend/zend_API.h
===
--- php/php-src/trunk/Zend/zend_API.h 2011-07-25 11:07:55 UTC (rev 313661)
+++ php/php-src/trunk/Zend/zend_API.h 2011-07-25 11:30:53 UTC (rev 313662)
@@ -96,6 +96,8 @@
#define ZEND_NS_FALIAS(ns, name, alias, arg_info)
ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
#define ZEND_NS_DEP_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns,
name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED)
+#define ZEND_FE_END{ NULL, NULL, NULL, 0, 0 }
+
#define ZEND_ARG_INFO(pass_by_ref, name)
{ #name, sizeof(#name)-1, NULL, 0, 0, 0, pass_by_ref},
#define ZEND_ARG_PASS_INFO(pass_by_ref)
{ NULL, 0, NULL, 0, 0, 0, pass_by_ref},
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name,
sizeof(#name)-1, #classname, sizeof(#classname)-1, IS_OBJECT, allow_null,
pass_by_ref},
Modified:
[PHP-CVS] svn: /php/php-src/trunk/ext/interbase/tests/ 003.phpt
mariuz Mon, 25 Jul 2011 11:41:06 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313664 Log: fix ident Changed paths: U php/php-src/trunk/ext/interbase/tests/003.phpt Modified: php/php-src/trunk/ext/interbase/tests/003.phpt === --- php/php-src/trunk/ext/interbase/tests/003.phpt 2011-07-25 11:35:02 UTC (rev 313663) +++ php/php-src/trunk/ext/interbase/tests/003.phpt 2011-07-25 11:41:06 UTC (rev 313664) @@ -21,7 +21,7 @@ v_numeric15_0 numeric(15,0), v_double double precision, v_float float, - v_integer integer, +v_integer integer, v_smallint smallint, v_varchar varchar(1) )); -- 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/Zend/zend_builtin_functions.c branches/PHP_5_4/Zend/zend_builtin_functions.c trunk/Zend/zend_builtin_functions.c
felipe Mon, 25 Jul 2011 11:50:10 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313666
Log:
- Use ZEND_FE_END macro here
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c
U php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
U php/php-src/trunk/Zend/zend_builtin_functions.c
Modified: php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2011-07-25
11:42:53 UTC (rev 313665)
+++ php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2011-07-25
11:50:10 UTC (rev 313666)
@@ -283,7 +283,7 @@
ZEND_FE(gc_enabled, arginfo_zend__void)
ZEND_FE(gc_enable, arginfo_zend__void)
ZEND_FE(gc_disable, arginfo_zend__void)
- { NULL, NULL, NULL }
+ ZEND_FE_END
};
/* }}} */
Modified: php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-07-25
11:42:53 UTC (rev 313665)
+++ php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-07-25
11:50:10 UTC (rev 313666)
@@ -306,7 +306,7 @@
ZEND_FE(gc_enabled, arginfo_zend__void)
ZEND_FE(gc_enable, arginfo_zend__void)
ZEND_FE(gc_disable, arginfo_zend__void)
- { NULL, NULL, NULL }
+ ZEND_FE_END
};
/* }}} */
Modified: php/php-src/trunk/Zend/zend_builtin_functions.c
===
--- php/php-src/trunk/Zend/zend_builtin_functions.c 2011-07-25 11:42:53 UTC
(rev 313665)
+++ php/php-src/trunk/Zend/zend_builtin_functions.c 2011-07-25 11:50:10 UTC
(rev 313666)
@@ -306,7 +306,7 @@
ZEND_FE(gc_enabled, arginfo_zend__void)
ZEND_FE(gc_enable, arginfo_zend__void)
ZEND_FE(gc_disable, arginfo_zend__void)
- { NULL, NULL, NULL }
+ ZEND_FE_END
};
/* }}} */
--
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_4/Zend/zend_builtin_functions.c trunk/Zend/zend_builtin_functions.c
felipe Mon, 25 Jul 2011 11:51:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313667
Log:
- Fix compiler warning
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
U php/php-src/trunk/Zend/zend_builtin_functions.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-07-25
11:50:10 UTC (rev 313666)
+++ php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2011-07-25
11:51:43 UTC (rev 313667)
@@ -1215,7 +1215,7 @@
found = zend_hash_find(EG(class_table), name, len+1, (void **)
ce);
free_alloca(lc_name, use_heap);
- RETURN_BOOL(found == SUCCESS !((*ce)-ce_flags
(ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT) ZEND_ACC_EXPLICIT_ABSTRACT_CLASS));
+ RETURN_BOOL(found == SUCCESS !(((*ce)-ce_flags
(ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT)) ZEND_ACC_EXPLICIT_ABSTRACT_CLASS));
}
if (zend_lookup_class(class_name, class_name_len, ce TSRMLS_CC) ==
SUCCESS) {
Modified: php/php-src/trunk/Zend/zend_builtin_functions.c
===
--- php/php-src/trunk/Zend/zend_builtin_functions.c 2011-07-25 11:50:10 UTC
(rev 313666)
+++ php/php-src/trunk/Zend/zend_builtin_functions.c 2011-07-25 11:51:43 UTC
(rev 313667)
@@ -1215,7 +1215,7 @@
found = zend_hash_find(EG(class_table), name, len+1, (void **)
ce);
free_alloca(lc_name, use_heap);
- RETURN_BOOL(found == SUCCESS !((*ce)-ce_flags
(ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT) ZEND_ACC_EXPLICIT_ABSTRACT_CLASS));
+ RETURN_BOOL(found == SUCCESS !(((*ce)-ce_flags
(ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT)) ZEND_ACC_EXPLICIT_ABSTRACT_CLASS));
}
if (zend_lookup_class(class_name, class_name_len, ce TSRMLS_CC) ==
SUCCESS) {
--
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/interbase/tests/ 003.phpt
mariuz Mon, 25 Jul 2011 13:04:22 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313669 Log: Replace FIELD with CONSTANT (that is the alias returned in Firebird stable 2.5.x ) Changed paths: U php/php-src/trunk/ext/interbase/tests/003.phpt Modified: php/php-src/trunk/ext/interbase/tests/003.phpt === --- php/php-src/trunk/ext/interbase/tests/003.phpt 2011-07-25 11:54:47 UTC (rev 313668) +++ php/php-src/trunk/ext/interbase/tests/003.phpt 2011-07-25 13:04:22 UTC (rev 313669) @@ -157,27 +157,27 @@ int(10) [ID_10]= int(11) - [FIELD_00]= + [CONSTANT]= int(12) - [FIELD_01]= + [CONSTANT_01]= int(13) - [FIELD_02]= + [CONSTANT_02]= int(14) - [FIELD_03]= + [CONSTANT_03]= int(15) - [FIELD_04]= + [CONSTANT_04]= int(16) - [FIELD_05]= + [CONSTANT_05]= int(17) - [FIELD_06]= + [CONSTANT_06]= int(18) - [FIELD_07]= + [CONSTANT_07]= int(19) - [FIELD_08]= + [CONSTANT_08]= int(20) - [FIELD_09]= + [CONSTANT_09]= int(21) - [FIELD_10]= + [CONSTANT_10]= int(22) } end of test -- 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_4/ext/mysqli/tests/connect.inc branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object.phpt branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object_oo.phpt trun
uw Mon, 25 Jul 2011 14:53:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313673
Log:
Test update. 5.4+ throws a catchable fatal error, 5.3 does not.
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object.phpt
U
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
U php/php-src/trunk/ext/mysqli/tests/connect.inc
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_object.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc 2011-07-25 14:38:26 UTC (rev 313672)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/connect.inc 2011-07-25 14:53:01 UTC (rev 313673)
@@ -225,4 +225,20 @@
} else {
printf(skip Eeeek/BUG/FIXME - connect.inc included twice! skipif bug?\n);
}
-?
\ No newline at end of file
+
+ function handle_catchable_fatal($errno, $error, $file, $line) {
+ static $errcodes = array();
+ if (empty($errcodes)) {
+ $constants = get_defined_constants();
+ foreach ($constants as $name = $value) {
+if (substr($name, 0, 2) == E_)
+ $errcodes[$value] = $name;
+ }
+ }
+ printf([%s] %s in %s on line %s\n,
+ (isset($errcodes[$errno])) ? $errcodes[$errno] : $errno,
+ $error, $file, $line);
+
+ return true;
+ }
+?
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object.phpt 2011-07-25 14:38:26 UTC (rev 313672)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object.phpt 2011-07-25 14:53:01 UTC (rev 313673)
@@ -10,6 +10,8 @@
?php
include_once(connect.inc);
+ set_error_handler('handle_catchable_fatal');
+
$tmp= NULL;
$link = NULL;
@@ -57,7 +59,7 @@
}
- $obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', null);
+ $obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', array());
if (($obj-ID !== 3) || ($obj-label !== c) || ($obj-a !== NULL) || ($obj-b !== NULL) || (get_class($obj) != 'mysqli_fetch_object_construct')) {
printf([006] Object seems wrong. [%d] %s\n, mysqli_errno($link), mysqli_error($link));
@@ -97,7 +99,7 @@
Also, I did not ask to get exceptions using the mysqli_options()
*/
try {
- if (false !== ($obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', 'a')))
+ if (false !== ($obj = @mysqli_fetch_object($res, 'mysqli_fetch_object_construct', 'a')))
printf([011] Should have failed\n);
} catch (Exception $e) {
printf(%s\n, $e-getMessage());
@@ -136,22 +138,19 @@
require_once(clean_table.inc);
?
--EXPECTF--
-Warning: Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d
-
-Warning: Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d
-
-Notice: Undefined variable: a in %s on line %d
-
-Notice: Undefined variable: b in %s on line %d
-
-Warning: Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d
-
-Notice: Undefined variable: b in %s on line %d
+[E_WARNING] mysqli_fetch_object() expects at least 1 parameter, 0 given in %s on line %d
+[E_WARNING] mysqli_fetch_object() expects parameter 1 to be mysqli_result, null given in %s on line %d
+[E_WARNING] Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d
+[E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d
+[E_NOTICE] Undefined variable: a in %s on line %d
+[E_NOTICE] Undefined variable: b in %s on line %d
+[E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d
+[E_NOTICE] Undefined variable: b in %s on line %d
NULL
NULL
-
-Warning: mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d
+[E_WARNING] mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d
NULL
+[E_RECOVERABLE_ERROR] Argument 3 passed to mysqli_fetch_object() must be of the type array, string given in %s on line %d
Parameter ctor_params must be an array
Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object_oo.phpt 2011-07-25 14:38:26 UTC (rev 313672)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_object_oo.phpt 2011-07-25 14:53:01 UTC (rev 313673)
@@ -9,6 +9,7 @@
--FILE--
?php
require_once(connect.inc);
+ set_error_handler('handle_catchable_fatal');
$tmp= NULL;
$link
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt trunk/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
uw Mon, 25 Jul 2011 15:07:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313674 Log: Test update. 5.4+ is more verbose. Changed paths: U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt === --- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt 2011-07-25 14:53:01 UTC (rev 313673) +++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt 2011-07-25 15:07:54 UTC (rev 313674) @@ -234,9 +234,23 @@ isUserDefined: no returnsReference: no Modifiers: 256 -Number of Parameters: 0 +Number of Parameters: 2 Number of Required Parameters: 0 +Inspecting parameter 'class_name' of method 'fetch_object' +isArray: no +allowsNull: no +isPassedByReference: no +isOptional: yes +isDefaultValueAvailable: no + +Inspecting parameter 'params' of method 'fetch_object' +isArray: yes +allowsNull: no +isPassedByReference: no +isOptional: yes +isDefaultValueAvailable: no + Inspecting method 'fetch_row' isFinal: no isAbstract: no Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt === --- php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt 2011-07-25 14:53:01 UTC (rev 313673) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt 2011-07-25 15:07:54 UTC (rev 313674) @@ -234,9 +234,23 @@ isUserDefined: no returnsReference: no Modifiers: 256 -Number of Parameters: 0 +Number of Parameters: 2 Number of Required Parameters: 0 +Inspecting parameter 'class_name' of method 'fetch_object' +isArray: no +allowsNull: no +isPassedByReference: no +isOptional: yes +isDefaultValueAvailable: no + +Inspecting parameter 'params' of method 'fetch_object' +isArray: yes +allowsNull: no +isPassedByReference: no +isOptional: yes +isDefaultValueAvailable: no + Inspecting method 'fetch_row' isFinal: no isAbstract: no -- 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_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
fa Mon, 25 Jul 2011 16:45:39 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313677
Log:
Fix #55121 Segfault with multipart/form-data POST
Bug: https://bugs.php.net/55121 (Assigned) Segfault with multipart/form-data
POST / 404 request
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-25
15:35:10 UTC (rev 313676)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-25
16:45:39 UTC (rev 313677)
@@ -1409,8 +1409,9 @@
request_info-content_length = request_info-post_data_length =
client-request.content_len;
{
char **val;
+ const char delimiter[] = ;;
if (SUCCESS == zend_hash_find(client-request.headers,
Content-Type, sizeof(Content-Type), (void**)val)) {
- request_info-content_type = *val;
+ request_info-content_type = strtok(*val, delimiter);
}
}
} /* }}} */
Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-25 15:35:10 UTC (rev
313676)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-25 16:45:39 UTC (rev
313677)
@@ -1409,8 +1409,9 @@
request_info-content_length = request_info-post_data_length =
client-request.content_len;
{
char **val;
+ const char delimiter[] = ;;
if (SUCCESS == zend_hash_find(client-request.headers,
Content-Type, sizeof(Content-Type), (void**)val)) {
- request_info-content_type = *val;
+ request_info-content_type = strtok(*val, delimiter);
}
}
} /* }}} */
--
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_4/UPGRADING.INTERNALS branches/PHP_5_4/main/fopen_wrappers.c branches/PHP_5_4/main/fopen_wrappers.h trunk/UPGRADING.INTERNALS trunk/main/fopen_wrappers.c tr
pajoye Mon, 25 Jul 2011 16:50:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313678
Log:
- add expand_filepath_with_mode (not used anywhere yet but will be used for
file ops (fopenco) to avoid extra links resolution and other non required ops
on open
Changed paths:
U php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS
U php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
U php/php-src/branches/PHP_5_4/main/fopen_wrappers.h
U php/php-src/trunk/UPGRADING.INTERNALS
U php/php-src/trunk/main/fopen_wrappers.c
U php/php-src/trunk/main/fopen_wrappers.h
Modified: php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS
===
--- php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS2011-07-25 16:45:39 UTC
(rev 313677)
+++ php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS2011-07-25 16:50:07 UTC
(rev 313678)
@@ -11,6 +11,7 @@
f. streams that enclose private streams
g. leak_variable
h. API Signature changes
+ i. new TSRM function expand_filepath_with_mode
2. Build system changes
a. Unix build system changes
@@ -184,6 +185,9 @@
. php_unescape_html_entities
PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen,
size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+ i.
+ PHPAPI char *expand_filepath_with_mode(const char *filepath, char
*real_path, const char *relative_to, size_t relative_to_len, int realpath_mode
TSRMLS_DC);
+ expand_filepath_with_mode lets define how realpath will behave, using one of
the existing mode: CWD_EXPAND , CWD_FILEPATH or CWD_REALPATH.
2. Build system changes
Modified: php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
===
--- php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-25 16:45:39 UTC
(rev 313677)
+++ php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-25 16:50:07 UTC
(rev 313678)
@@ -741,6 +741,14 @@
*/
PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC)
{
+ return expand_filepath_with_mode(filepath, real_path, relative_to,
relative_to_len, CWD_FILEPATH TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ expand_filepath_use_realpath
+ */
+PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path,
const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC)
+{
cwd_state new_state;
char cwd[MAXPATHLEN];
int copy_len;
@@ -785,7 +793,7 @@
new_state.cwd = strdup(cwd);
new_state.cwd_length = strlen(cwd);
- if (virtual_file_ex(new_state, filepath, NULL, CWD_FILEPATH
TSRMLS_CC)) {
+ if (virtual_file_ex(new_state, filepath, NULL, realpath_mode
TSRMLS_CC)) {
free(new_state.cwd);
return NULL;
}
Modified: php/php-src/branches/PHP_5_4/main/fopen_wrappers.h
===
--- php/php-src/branches/PHP_5_4/main/fopen_wrappers.h 2011-07-25 16:45:39 UTC
(rev 313677)
+++ php/php-src/branches/PHP_5_4/main/fopen_wrappers.h 2011-07-25 16:50:07 UTC
(rev 313678)
@@ -28,6 +28,7 @@
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC);
+PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path,
const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
Modified: php/php-src/trunk/UPGRADING.INTERNALS
===
--- php/php-src/trunk/UPGRADING.INTERNALS 2011-07-25 16:45:39 UTC (rev
313677)
+++ php/php-src/trunk/UPGRADING.INTERNALS 2011-07-25 16:50:07 UTC (rev
313678)
@@ -11,6 +11,7 @@
f. streams that enclose private streams
g. leak_variable
h. API Signature changes
+ i. new TSRM function expand_filepath_with_mode
2. Build system changes
a. Unix build system changes
@@ -184,6 +185,9 @@
. php_unescape_html_entities
PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen,
size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+ i.
+ PHPAPI char *expand_filepath_with_mode(const char *filepath, char
*real_path, const char *relative_to, size_t relative_to_len, int realpath_mode
TSRMLS_DC);
+ expand_filepath_with_mode lets define how realpath will behave, using one of
the existing mode: CWD_EXPAND , CWD_FILEPATH or CWD_REALPATH.
2. Build system changes
Modified:
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt trunk/ext/oci8/tests/xmltype_02.phpt
sixd Mon, 25 Jul 2011 17:22:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313679
Log:
Update skipif
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt
U php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt 2011-07-25
16:50:07 UTC (rev 313678)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt 2011-07-25
17:22:48 UTC (rev 313679)
@@ -4,6 +4,7 @@
?php
$target_dbs = array('oracledb' = true, 'timesten' = false); // test runs on
these DBs
require(dirname(__FILE__).'/skipif.inc');
+if (!extension_loaded(simplexml)) die (skip no simplexml extension);
?
--FILE--
?php
Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt
===
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt 2011-07-25
16:50:07 UTC (rev 313678)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt 2011-07-25
17:22:48 UTC (rev 313679)
@@ -4,6 +4,7 @@
?php
$target_dbs = array('oracledb' = true, 'timesten' = false); // test runs on
these DBs
require(dirname(__FILE__).'/skipif.inc');
+if (!extension_loaded(simplexml)) die (skip no simplexml extension);
?
--FILE--
?php
Modified: php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt
===
--- php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt2011-07-25 16:50:07 UTC
(rev 313678)
+++ php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt2011-07-25 17:22:48 UTC
(rev 313679)
@@ -4,6 +4,7 @@
?php
$target_dbs = array('oracledb' = true, 'timesten' = false); // test runs on
these DBs
require(dirname(__FILE__).'/skipif.inc');
+if (!extension_loaded(simplexml)) die (skip no simplexml extension);
?
--FILE--
?php
--
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_4/ext/oci8/package.xml trunk/ext/oci8/package.xml
sixd Mon, 25 Jul 2011 17:25:47 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313680 Log: Remove old testname. This file now diverges from PHP_5_3 Changed paths: U php/php-src/branches/PHP_5_4/ext/oci8/package.xml U php/php-src/trunk/ext/oci8/package.xml Modified: php/php-src/branches/PHP_5_4/ext/oci8/package.xml === --- php/php-src/branches/PHP_5_4/ext/oci8/package.xml 2011-07-25 17:22:48 UTC (rev 313679) +++ php/php-src/branches/PHP_5_4/ext/oci8/package.xml 2011-07-25 17:25:47 UTC (rev 313680) @@ -33,7 +33,7 @@ activeno/active /lead - date2011-06-10/date + date2011-07-25/date time12:00:00/time version @@ -338,7 +338,6 @@ file name=null_byte_2.phpt role=test / file name=null_byte_3.phpt role=test / file name=num.phpt role=test / -file name=oci8safemode.phpt role=test / file name=oci_execute_segfault.phpt role=test / file name=old_oci_close1.phpt role=test / file name=old_oci_close.phpt role=test / Modified: php/php-src/trunk/ext/oci8/package.xml === --- php/php-src/trunk/ext/oci8/package.xml 2011-07-25 17:22:48 UTC (rev 313679) +++ php/php-src/trunk/ext/oci8/package.xml 2011-07-25 17:25:47 UTC (rev 313680) @@ -33,7 +33,7 @@ activeno/active /lead - date2011-06-10/date + date2011-07-25/date time12:00:00/time version @@ -338,7 +338,6 @@ file name=null_byte_2.phpt role=test / file name=null_byte_3.phpt role=test / file name=num.phpt role=test / -file name=oci8safemode.phpt role=test / file name=oci_execute_segfault.phpt role=test / file name=old_oci_close1.phpt role=test / file name=old_oci_close.phpt role=test / -- 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/oci8/oci8.c branches/PHP_5_4/ext/oci8/oci8.c trunk/ext/oci8/oci8.c
sixd Mon, 25 Jul 2011 17:30:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313681
Log:
Patch r313663 and r313665 to allow PECL builds to work with earlier releases
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
U php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
U php/php-src/trunk/ext/oci8/oci8.c
Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2011-07-25 17:25:47 UTC
(rev 313680)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2011-07-25 17:30:09 UTC
(rev 313681)
@@ -937,7 +937,11 @@
PHP_FALIAS(ocicollsize, oci_collection_size,
arginfo_oci_collection_size)
PHP_FALIAS(ocicollmax, oci_collection_max,
arginfo_oci_collection_max)
PHP_FALIAS(ocicolltrim, oci_collection_trim,
arginfo_oci_collection_trim)
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 3 PHP_RELEASE_VERSION
= 7) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 4) ||
(PHP_MAJOR_VERSION 5)
PHP_FE_END
+#else
+ {NULL,NULL,NULL}
+#endif
};
static
@@ -968,7 +972,11 @@
PHP_FALIAS(save,oci_lob_save,
arginfo_oci_lob_save_method)
PHP_FALIAS(savefile,oci_lob_import,
arginfo_oci_lob_import_method)
PHP_FALIAS(free,oci_free_descriptor,
arginfo_oci_free_descriptor_method)
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 3 PHP_RELEASE_VERSION
= 7) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 4) ||
(PHP_MAJOR_VERSION 5)
PHP_FE_END
+#else
+ {NULL,NULL,NULL}
+#endif
};
static
@@ -985,7 +993,11 @@
PHP_FALIAS(max, oci_collection_max,
arginfo_oci_collection_max_method)
PHP_FALIAS(trim, oci_collection_trim,
arginfo_oci_collection_trim_method)
PHP_FALIAS(free, oci_free_collection,
arginfo_oci_collection_free_method)
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 3 PHP_RELEASE_VERSION
= 7) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 4) ||
(PHP_MAJOR_VERSION 5)
PHP_FE_END
+#else
+ {NULL,NULL,NULL}
+#endif
};
zend_module_entry oci8_module_entry = {
Modified: php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_4/ext/oci8/oci8.c2011-07-25 17:25:47 UTC
(rev 313680)
+++ php/php-src/branches/PHP_5_4/ext/oci8/oci8.c2011-07-25 17:30:09 UTC
(rev 313681)
@@ -937,7 +937,11 @@
PHP_FALIAS(ocicollsize, oci_collection_size,
arginfo_oci_collection_size)
PHP_FALIAS(ocicollmax, oci_collection_max,
arginfo_oci_collection_max)
PHP_FALIAS(ocicolltrim, oci_collection_trim,
arginfo_oci_collection_trim)
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 3 PHP_RELEASE_VERSION
= 7) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 4) ||
(PHP_MAJOR_VERSION 5)
PHP_FE_END
+#else
+ {NULL,NULL,NULL}
+#endif
};
static
@@ -968,7 +972,11 @@
PHP_FALIAS(save,oci_lob_save,
arginfo_oci_lob_save_method)
PHP_FALIAS(savefile,oci_lob_import,
arginfo_oci_lob_import_method)
PHP_FALIAS(free,oci_free_descriptor,
arginfo_oci_free_descriptor_method)
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 3 PHP_RELEASE_VERSION
= 7) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 4) ||
(PHP_MAJOR_VERSION 5)
PHP_FE_END
+#else
+ {NULL,NULL,NULL}
+#endif
};
static
@@ -985,7 +993,11 @@
PHP_FALIAS(max, oci_collection_max,
arginfo_oci_collection_max_method)
PHP_FALIAS(trim, oci_collection_trim,
arginfo_oci_collection_trim_method)
PHP_FALIAS(free, oci_free_collection,
arginfo_oci_collection_free_method)
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 3 PHP_RELEASE_VERSION
= 7) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION = 4) ||
(PHP_MAJOR_VERSION 5)
PHP_FE_END
+#else
+ {NULL,NULL,NULL}
+#endif
};
zend_module_entry oci8_module_entry = {
Modified: php/php-src/trunk/ext/oci8/oci8.c
===
--- php/php-src/trunk/ext/oci8/oci8.c 2011-07-25 17:25:47 UTC (rev 313680)
+++ php/php-src/trunk/ext/oci8/oci8.c 2011-07-25 17:30:09 UTC (rev 313681)
@@ -937,7 +937,11 @@
PHP_FALIAS(ocicollsize, oci_collection_size,
arginfo_oci_collection_size)
PHP_FALIAS(ocicollmax,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/phar/ phar_object.c
felipe Mon, 25 Jul 2011 21:39:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313687
Log:
- Revert accidental change
Changed paths:
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
===
--- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2011-07-25 21:03:17 UTC
(rev 313686)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2011-07-25 21:39:53 UTC
(rev 313687)
@@ -1144,7 +1144,7 @@
RETVAL_BOOL(phar_open_from_filename(fname, fname_len, alias, alias_len,
REPORT_ERRORS, NULL, error TSRMLS_CC) == SUCCESS);
if (error) {
- zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC,
error);
+ zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC,
%s, error);
efree(error);
}
} /* }}} */
--
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/oci8/oci8.c branches/PHP_5_4/ext/oci8/oci8.c trunk/ext/oci8/oci8.c
sixd Mon, 25 Jul 2011 23:40:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313688
Log:
Fix cast warning seen on some platforms
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
U php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
U php/php-src/trunk/ext/oci8/oci8.c
Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2011-07-25 21:39:53 UTC
(rev 313687)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2011-07-25 23:40:57 UTC
(rev 313688)
@@ -37,6 +37,13 @@
#include php_ini.h
#include ext/standard/php_smart_str.h
+#ifdef HAVE_STDINT_H
+#include stdint.h
+#endif
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#endif
+
#if HAVE_OCI8
#if PHP_MAJOR_VERSION 5
@@ -51,6 +58,14 @@
#include php_oci8_int.h
#include zend_hash.h
+#if defined(HAVE_STDINT_H) || defined(PHP_WIN32)
+#define OCI8_INT_TO_PTR(I) ((void *)(intptr_t)(I))
+#define OCI8_PTR_TO_INT(P) ((int)(intptr_t)(P))
+#else
+#define OCI8_INT_TO_PTR(I) ((void *)(I))
+#define OCI8_PTR_TO_INT(P) ((int)(P))
+#endif
+
ZEND_DECLARE_MODULE_GLOBALS(oci)
#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
/* This if allows PECL builds from this file to be portable to older PHP
releases */
@@ -1877,7 +1892,7 @@
int type, link;
void *ptr;
- link = (int) le-ptr;
+ link = OCI8_PTR_TO_INT(le-ptr);
ptr = zend_list_find(link,type);
if (ptr (type == le_connection)) {
connection = (php_oci_connection *)ptr;
@@ -2116,7 +2131,7 @@
#else
connection-rsrc_id = zend_list_insert(connection,
le_connection);
#endif
- new_le.ptr = (void *)connection-rsrc_id;
+ new_le.ptr = OCI8_INT_TO_PTR(connection-rsrc_id);
new_le.type = le_index_ptr;
zend_hash_update(EG(regular_list), connection-hash_key,
strlen(connection-hash_key)+1, (void *)new_le, sizeof(zend_rsrc_list_entry),
NULL);
OCI_G(num_links)++;
Modified: php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_4/ext/oci8/oci8.c2011-07-25 21:39:53 UTC
(rev 313687)
+++ php/php-src/branches/PHP_5_4/ext/oci8/oci8.c2011-07-25 23:40:57 UTC
(rev 313688)
@@ -37,6 +37,13 @@
#include php_ini.h
#include ext/standard/php_smart_str.h
+#ifdef HAVE_STDINT_H
+#include stdint.h
+#endif
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#endif
+
#if HAVE_OCI8
#if PHP_MAJOR_VERSION 5
@@ -51,6 +58,14 @@
#include php_oci8_int.h
#include zend_hash.h
+#if defined(HAVE_STDINT_H) || defined(PHP_WIN32)
+#define OCI8_INT_TO_PTR(I) ((void *)(intptr_t)(I))
+#define OCI8_PTR_TO_INT(P) ((int)(intptr_t)(P))
+#else
+#define OCI8_INT_TO_PTR(I) ((void *)(I))
+#define OCI8_PTR_TO_INT(P) ((int)(P))
+#endif
+
ZEND_DECLARE_MODULE_GLOBALS(oci)
#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
/* This if allows PECL builds from this file to be portable to older PHP
releases */
@@ -1877,7 +1892,7 @@
int type, link;
void *ptr;
- link = (int) le-ptr;
+ link = OCI8_PTR_TO_INT(le-ptr);
ptr = zend_list_find(link,type);
if (ptr (type == le_connection)) {
connection = (php_oci_connection *)ptr;
@@ -2116,7 +2131,7 @@
#else
connection-rsrc_id = zend_list_insert(connection,
le_connection);
#endif
- new_le.ptr = (void *)connection-rsrc_id;
+ new_le.ptr = OCI8_INT_TO_PTR(connection-rsrc_id);
new_le.type = le_index_ptr;
zend_hash_update(EG(regular_list), connection-hash_key,
strlen(connection-hash_key)+1, (void *)new_le, sizeof(zend_rsrc_list_entry),
NULL);
OCI_G(num_links)++;
Modified: php/php-src/trunk/ext/oci8/oci8.c
===
--- php/php-src/trunk/ext/oci8/oci8.c 2011-07-25 21:39:53 UTC (rev 313687)
+++ php/php-src/trunk/ext/oci8/oci8.c 2011-07-25 23:40:57 UTC (rev 313688)
@@ -37,6 +37,13 @@
#include php_ini.h
#include ext/standard/php_smart_str.h
+#ifdef HAVE_STDINT_H
+#include stdint.h
+#endif
+#ifdef PHP_WIN32
+#include win32/php_stdint.h
+#endif
+
#if HAVE_OCI8
#if PHP_MAJOR_VERSION 5
@@ -51,6 +58,14 @@
#include php_oci8_int.h
#include zend_hash.h
+#if defined(HAVE_STDINT_H) || defined(PHP_WIN32)
+#define OCI8_INT_TO_PTR(I) ((void *)(intptr_t)(I))
+#define
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Mon, 25 Jul 2011 11:04:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313659 Log: - system's karma for Tyrael, so he can store/alter cfgco Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-07-25 08:14:17 UTC (rev 313658) +++ SVNROOT/global_avail2011-07-25 11:04:43 UTC (rev 313659) @@ -130,7 +130,7 @@ avail|changelog|php/php-src,gtk/php-gtk # Some people have access to change the day-to-day code on the various php.net machines -avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms,dsp,felipe|systems +avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms,dsp,felipe,tyrael|systems # Finally, there are various people with access to various bits and # pieces of other SVN modules. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
