[PHP-CVS] com php-src: converted simplexml ext: ext/simplexml/simplexml.c
Commit:015d179e4912f42376b2793a11f24034c873a5fc
Author:Anatol Belski a...@php.net Thu, 21 Nov 2013 16:17:10 +0100
Parents: 607f97cefaa852ae3f33d77ee6ad040047f1394b
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=015d179e4912f42376b2793a11f24034c873a5fc
Log:
converted simplexml ext
Changed paths:
M ext/simplexml/simplexml.c
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index eba46b9..c52f0b5 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -140,9 +140,9 @@ static inline int match_ns(php_sxe_object *sxe, xmlNodePtr
node, xmlChar *name,
}
/* }}} */
-static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, long offset,
xmlNodePtr node, long *cnt) /* {{{ */
+static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, php_int_t
offset, xmlNodePtr node, php_int_t *cnt) /* {{{ */
{
- long nodendx = 0;
+ php_int_t nodendx = 0;
if (sxe-iter.type == SXE_ITER_NONE) {
if (offset == 0) {
@@ -332,7 +332,7 @@ static zval * sxe_prop_dim_read(zval *object, zval *member,
zend_bool elements,
php_libxml_increment_node_ptr((php_libxml_node_object *)sxe, node, NULL
TSRMLS_CC);
}
if (!member || Z_TYPE_P(member) == IS_LONG) {
- long cnt = 0;
+ php_int_t cnt = 0;
xmlNodePtr mynode = node;
if (sxe-iter.type == SXE_ITER_CHILD) {
@@ -462,7 +462,7 @@ static int sxe_prop_dim_write(zval *object, zval *member,
zval *value, zend_bool
int nodendx = 0;
int test = 0;
int new_value = 0;
- longcnt = 0;
+ php_int_tcnt = 0;
int retval = SUCCESS;
zvaltmp_zv, trim_zv, value_copy;
@@ -485,12 +485,12 @@ static int sxe_prop_dim_write(zval *object, zval *member,
zval *value, zend_bool
trim_zv = *member;
zval_copy_ctor(trim_zv);
convert_to_string(trim_zv);
- php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0,
tmp_zv, 3 TSRMLS_CC);
+ php_trim(Z_STRVAL(trim_zv), Z_STRSIZE(trim_zv), NULL,
0, tmp_zv, 3 TSRMLS_CC);
zval_dtor(trim_zv);
member = tmp_zv;
}
- if (!Z_STRLEN_P(member)) {
+ if (!Z_STRSIZE_P(member)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
write or create unnamed %s, attribs ? attribute : element);
if (member == tmp_zv) {
zval_dtor(tmp_zv);
@@ -1037,7 +1037,7 @@ static void sxe_properties_add(HashTable *rv, char *name,
int namelen, zval *val
{
zval **data_ptr;
zval *newptr;
- ulong h = zend_hash_func(name, namelen);
+ php_uint_t h = zend_hash_func(name, namelen);
if (zend_hash_quick_find(rv, name, namelen, h, (void **) data_ptr) ==
SUCCESS) {
if (Z_TYPE_PP(data_ptr) == IS_ARRAY) {
@@ -1246,7 +1246,7 @@ SXE_METHOD(xpath)
php_sxe_object*sxe;
zval *value;
char *query;
- intquery_len;
+ zend_str_size_intquery_len;
inti;
intnsnbr = 0;
xmlNsPtr *ns = NULL;
@@ -1254,7 +1254,7 @@ SXE_METHOD(xpath)
xmlNodeSetPtr result;
xmlNodePtr nodeptr;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, query,
query_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, S, query,
query_len) == FAILURE) {
return;
}
@@ -1332,10 +1332,10 @@ SXE_METHOD(xpath)
SXE_METHOD(registerXPathNamespace)
{
php_sxe_object*sxe;
- int prefix_len, ns_uri_len;
+ zend_str_size_int prefix_len, ns_uri_len;
char *prefix, *ns_uri;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, prefix,
prefix_len, ns_uri, ns_uri_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, SS, prefix,
prefix_len, ns_uri, ns_uri_len) == FAILURE) {
return;
}
@@ -1360,16 +1360,16 @@ SXE_METHOD(asXML)
xmlNodePtr node;
xmlOutputBufferPtr outbuf;
xmlChar*strval;
- int strval_len;
+ zend_str_size_int strval_len;
char *filename;
- int filename_len;
+ zend_str_size_int filename_len;
if (ZEND_NUM_ARGS() 1) {
RETURN_FALSE;
}
if (ZEND_NUM_ARGS()
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/mysqlnd_ps_codec.c
Commit:763f4aef8b84847d82ada4c4bb07c1e8b3e21e36 Author:Andrey Hristov and...@php.net Thu, 21 Nov 2013 21:29:37 +0200 Parents: c2b2afacc03cc9b93f7cd73d3ada8995ac54960e ce098222696b505b93faea37414446740dbd9846 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=763f4aef8b84847d82ada4c4bb07c1e8b3e21e36 Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM ext/mysqlnd/mysqlnd_ps_codec.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: first shot for php-cgi for size_t and php_int_t: main/SAPI.h sapi/cgi/cgi_main.c sapi/cgi/fastcgi.c sapi/cgi/fastcgi.h sapi/cli/php_cli_server.c
Commit:51003463ef0c67ff83e40cbbc66464c86a7e0feb
Author:Anatol Belski a...@php.net Thu, 21 Nov 2013 13:26:56 +0100
Parents: fb27e16f01a4b96deaec6eb237f26753ae2a27ee
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=51003463ef0c67ff83e40cbbc66464c86a7e0feb
Log:
first shot for php-cgi for size_t and php_int_t
Changed paths:
M main/SAPI.h
M sapi/cgi/cgi_main.c
M sapi/cgi/fastcgi.c
M sapi/cgi/fastcgi.h
M sapi/cli/php_cli_server.c
diff --git a/main/SAPI.h b/main/SAPI.h
index 124d0cc..7d27b65 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -237,7 +237,7 @@ struct _sapi_module_struct {
int (*send_headers)(sapi_headers_struct *sapi_headers TSRMLS_DC);
void (*send_header)(sapi_header_struct *sapi_header, void
*server_context TSRMLS_DC);
- zend_str_size_int (*read_post)(char *buffer, uint count_bytes
TSRMLS_DC);
+ zend_str_size_int (*read_post)(char *buffer, zend_str_size_uint
count_bytes TSRMLS_DC);
char *(*read_cookies)(TSRMLS_D);
void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 422dabb..b1a703e 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -269,10 +269,10 @@ static void print_extensions(TSRMLS_D)
#define STDOUT_FILENO 1
#endif
-static inline size_t sapi_cgi_single_write(const char *str, uint str_length
TSRMLS_DC)
+static inline size_t sapi_cgi_single_write(const char *str, zend_str_size_uint
str_length TSRMLS_DC)
{
#ifdef PHP_WRITE_STDOUT
- long ret;
+ int ret;
ret = write(STDOUT_FILENO, str, str_length);
if (ret = 0) return 0;
@@ -285,11 +285,11 @@ static inline size_t sapi_cgi_single_write(const char
*str, uint str_length TSRM
#endif
}
-static int sapi_cgi_ub_write(const char *str, uint str_length TSRMLS_DC)
+static zend_str_size_int sapi_cgi_ub_write(const char *str, zend_str_size_uint
str_length TSRMLS_DC)
{
const char *ptr = str;
- uint remaining = str_length;
- size_t ret;
+ zend_str_size_uint remaining = str_length;
+ zend_str_size_int ret;
while (remaining 0) {
ret = sapi_cgi_single_write(ptr, remaining TSRMLS_CC);
@@ -304,14 +304,14 @@ static int sapi_cgi_ub_write(const char *str, uint
str_length TSRMLS_DC)
return str_length;
}
-static int sapi_fcgi_ub_write(const char *str, uint str_length TSRMLS_DC)
+static zend_str_size_int sapi_fcgi_ub_write(const char *str,
zend_str_size_uint str_length TSRMLS_DC)
{
const char *ptr = str;
- uint remaining = str_length;
+ zend_str_size_uint remaining = str_length;
fcgi_request *request = (fcgi_request*) SG(server_context);
while (remaining 0) {
- long ret = fcgi_write(request, FCGI_STDOUT, ptr, remaining);
+ php_int_t ret = fcgi_write(request, FCGI_STDOUT, ptr,
remaining);
if (ret = 0) {
php_handle_aborted_connection();
@@ -503,14 +503,13 @@ static int sapi_cgi_send_headers(sapi_headers_struct
*sapi_headers TSRMLS_DC)
# define STDIN_FILENO 0
#endif
-static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
+static zend_str_size_int sapi_cgi_read_post(char *buffer, zend_str_size_uint
count_bytes TSRMLS_DC)
{
- uint read_bytes = 0;
- int tmp_read_bytes;
+ zend_str_size_uint read_bytes = 0;
count_bytes = MIN(count_bytes, SG(request_info).content_length -
SG(read_post_bytes));
while (read_bytes count_bytes) {
- tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes,
count_bytes - read_bytes);
+ int tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes,
count_bytes - read_bytes);
if (tmp_read_bytes = 0) {
break;
}
@@ -519,7 +518,7 @@ static int sapi_cgi_read_post(char *buffer, uint
count_bytes TSRMLS_DC)
return read_bytes;
}
-static int sapi_fcgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
+static zend_str_size_int sapi_fcgi_read_post(char *buffer, zend_str_size_uint
count_bytes TSRMLS_DC)
{
uint read_bytes = 0;
int tmp_read_bytes;
@@ -616,11 +615,11 @@ static char *sapi_fcgi_read_cookies(TSRMLS_D)
return FCGI_GETENV(request, HTTP_COOKIE);
}
-static void cgi_php_load_env_var(char *var, unsigned int var_len, char *val,
unsigned int val_len, void *arg TSRMLS_DC)
+static void cgi_php_load_env_var(char *var, zend_str_size_uint var_len, char
*val, zend_str_size_uint val_len, void *arg TSRMLS_DC)
{
zval *array_ptr = (zval*)arg;
int filter_arg = (array_ptr ==
PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER;
- unsigned int new_val_len;
+ zend_str_size_uint new_val_len;
if (sapi_module.input_filter(filter_arg, var, val, strlen(val),
new_val_len TSRMLS_CC)) {
[PHP-CVS] com php-src: fixed libxml: ext/libxml/libxml.c
Commit:607f97cefaa852ae3f33d77ee6ad040047f1394b
Author:Anatol Belski a...@php.net Thu, 21 Nov 2013 15:08:39 +0100
Parents: 51003463ef0c67ff83e40cbbc66464c86a7e0feb
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=607f97cefaa852ae3f33d77ee6ad040047f1394b
Log:
fixed libxml
Changed paths:
M ext/libxml/libxml.c
Diff:
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 05b8df4..418ec11 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -88,7 +88,7 @@ static PHP_MINIT_FUNCTION(libxml);
static PHP_RINIT_FUNCTION(libxml);
static PHP_MSHUTDOWN_FUNCTION(libxml);
static PHP_MINFO_FUNCTION(libxml);
-static int php_libxml_post_deactivate();
+static int php_libxml_post_deactivate(void);
/* }}} */
@@ -356,13 +356,13 @@ static void
*php_libxml_streams_IO_open_write_wrapper(const char *filename)
static int php_libxml_streams_IO_read(void *context, char *buffer, int len)
{
TSRMLS_FETCH();
- return php_stream_read((php_stream*)context, buffer, len);
+ return (int)php_stream_read((php_stream*)context, buffer, len);
}
static int php_libxml_streams_IO_write(void *context, const char *buffer, int
len)
{
TSRMLS_FETCH();
- return php_stream_write((php_stream*)context, buffer, len);
+ return (int)php_stream_write((php_stream*)context, buffer, len);
}
static int php_libxml_streams_IO_close(void *context)
@@ -515,7 +515,7 @@ void php_libxml_issue_error(int level, const char *msg
TSRMLS_DC)
static void php_libxml_internal_error_handler(int error_type, void *ctx, const
char **msg, va_list ap)
{
char *buf;
- int len, len_iter, output = 0;
+ zend_str_size_int len, len_iter, output = 0;
TSRMLS_FETCH();
@@ -876,7 +876,7 @@ static PHP_MSHUTDOWN_FUNCTION(libxml)
return SUCCESS;
}
-static int php_libxml_post_deactivate()
+static int php_libxml_post_deactivate(void)
{
TSRMLS_FETCH();
/* reset libxml generic error handling */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed the skipif part: sapi/cli/tests/upload_2G.phpt
Commit:fb27e16f01a4b96deaec6eb237f26753ae2a27ee
Author:Anatol Belski a...@php.net Thu, 21 Nov 2013 11:54:35 +0100
Parents: c63f8bdfba87edeb2c31c043b04977fb8275490d
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=fb27e16f01a4b96deaec6eb237f26753ae2a27ee
Log:
fixed the skipif part
Changed paths:
M sapi/cli/tests/upload_2G.phpt
Diff:
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
index b8416ea..a172ccd 100644
--- a/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@ -8,18 +8,36 @@ if (PHP_INT_SIZE 8) {
die(skip need PHP_INT_SIZE=8);
}
-if ($f = fopen(/proc/meminfo,r)) {
+$enough_free_ram = false;
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+ exec(c:\\Windows\\System32\\systeminfo.exe, $out);
+
+ foreach($out as $ln) {
+ $s = Virtual Memory: Available:;
+ if (false !== strpos($ln, $s)) {
+ $p = /$s\s*([0-9,\.]+)\*s/;
+ if (preg_match(/$s\s*([0-9,\.]+)/, $ln, $m)) {
+ $ram = str_replace(array(,, .), ,
$m[1])/1024;
+ if ($ram 3) {
+ $enough_free_ram = true;
+ break;
+ }
+ }
+ }
+ }
+} else if ($f = fopen(/proc/meminfo,r)) {
while (!feof($f)) {
if (!strncmp($line = fgets($f), MemFree, 7)) {
if (substr($line,8)/1024/1024 3) {
$enough_free_ram = true;
+ break;
}
}
}
}
if (empty($enough_free_ram)) {
- die(need +3G free RAM);
+ die(skip need +3G free RAM);
}
?
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed test: ext/standard/tests/serialize/serialization_error_002.phpt
Commit:345032946c9143d0d343ef1b5de12b6130780fdf Author:Anatol Belski a...@php.net Thu, 21 Nov 2013 21:24:47 +0100 Parents: ce098222696b505b93faea37414446740dbd9846 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=345032946c9143d0d343ef1b5de12b6130780fdf Log: fixed test Changed paths: M ext/standard/tests/serialize/serialization_error_002.phpt Diff: diff --git a/ext/standard/tests/serialize/serialization_error_002.phpt b/ext/standard/tests/serialize/serialization_error_002.phpt index 6b4f6e3..70f35e4 100644 --- a/ext/standard/tests/serialize/serialization_error_002.phpt +++ b/ext/standard/tests/serialize/serialization_error_002.phpt @@ -43,7 +43,7 @@ echo Done; *** Testing unserialize() error/boolean distinction *** string(4) b:0; -Notice: unserialize(): Error at offset 0 of 27 bytes in %s/serialization_error_002.php on line 20 +Notice: unserialize(): Error at offset 0 of 27 bytes in %s%eserialization_error_002.php on line 20 bool(false) bool(false) unserialize error and deserialized false are identical? 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
