com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/dba/dba.c ext/pgsql/p gsql.c ext/standard/basic_functions.c
ext/wddx/wddx .c
| From: | Anatol Belski | Date: | Sun, 16 Feb 2014 00:12:00 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/dba/dba.c ext/pgsql/p gsql.c ext/standard/basic_functions.c ext/wddx/wddx .c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76014@lists.php.net to get a copy of this message | ||
Commit: 5847fc8b2012d01f713e807e5eca9be82b7bb151
Author: Anatol Belski <ab@php.net> Sun, 16 Feb 2014 01:12:00 +0100
Parents: c9e2bfc424414673fab14b21e9fd352401ec8a9f 1aa6f95651259b2e4f6dec1d379c3a64cc546061
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5847fc8b2012d01f713e807e5eca9be82b7bb151
Log:
Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
ext/pgsql/pgsql.c
Changed paths:
MM ext/dba/dba.c
MM ext/pgsql/pgsql.c
MM ext/standard/basic_functions.c
MM ext/wddx/wddx.c
Diff:
diff --cc ext/pgsql/pgsql.c
index e0ee980,e0e7f96..bd5cd86
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -1058,27 -1053,8 +1058,7 @@@ static int _php_pgsql_detect_identifier
return SUCCESS;
}
- /* {{{ _php_pgsql_strndup, no strndup should be used */
- static char *_php_pgsql_strndup(const char *s, size_t len)
- {
- char *new;
-
- if (NULL == s) {
- return (char *)NULL;
- }
-
- new = (char *) malloc(len + 1);
-
- if (NULL == new) {
- return (char *)NULL;
- }
-
- new[len] = '\0';
-
- return memmove(new, s, len);
- }
- /* }}} */
-
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()