[PHP-CVS] com php-src: OCI8 build change: Fix source variable definition for C89 compatibility: ext/oci8/oci8.c ext/oci8/package.xml ext/oci8/php_oci8.h
Commit:bc748ba38ce93025178a0f9de6c444f5cd25ad1d
Author:Christopher Jones s...@php.net Wed, 6 Nov 2013 10:37:22
-0800
Parents: c9d00a23ae5e34bd03dd71f53b5be8b412ad4302
Branches: PHP-5.6 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=bc748ba38ce93025178a0f9de6c444f5cd25ad1d
Log:
OCI8 build change: Fix source variable definition for C89 compatibility
Changed paths:
M ext/oci8/oci8.c
M ext/oci8/package.xml
M ext/oci8/php_oci8.h
Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index f8abacf..1e505f1 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2201,6 +2201,9 @@ php_oci_connection *php_oci_do_connect_ex(char *username,
int username_len, char
static int php_oci_connection_ping(php_oci_connection *connection TSRMLS_DC)
{
sword errstatus;
+#if (!((OCI_MAJOR_VERSION 10) || ((OCI_MAJOR_VERSION == 10)
(OCI_MINOR_VERSION = 2
+ char version[256];
+#endif
OCI_G(errcode) = 0; /* assume ping is successful */
@@ -2212,7 +2215,6 @@ static int php_oci_connection_ping(php_oci_connection
*connection TSRMLS_DC)
#if ((OCI_MAJOR_VERSION 10) || ((OCI_MAJOR_VERSION == 10)
(OCI_MINOR_VERSION = 2))) /* OCIPing available 10.2 onwards */
PHP_OCI_CALL_RETURN(errstatus, OCIPing, (connection-svc, OCI_G(err),
OCI_DEFAULT));
#else
- char version[256];
/* use good old OCIServerVersion() */
PHP_OCI_CALL_RETURN(errstatus, OCIServerVersion, (connection-svc,
OCI_G(err), (text *)version, sizeof(version), OCI_HTYPE_SVCCTX));
#endif
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 7be825b..8e55b9a 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -49,8 +49,8 @@ libraries are available.
time12:00:00/time
version
- release2.0.6/release
- api2.0.6/api
+ release2.0.7/release
+ api2.0.7/api
/version
stability
releasestable/release
@@ -58,8 +58,7 @@ libraries are available.
/stability
license uri=http://www.php.net/license;PHP/license
notes
-Added a LICENSE file to make it easier for PECL binary distributions
-to conform with the license.
+Build change: Fix source variable definition for C89 compatibility
/notes
contents
dir name=/
@@ -460,6 +459,22 @@ to conform with the license.
release
version
+ release2.0.6/release
+ api2.0.6/api
+ /version
+ stability
+ releasestable/release
+ apistable/api
+ /stability
+ license uri=http://www.php.net/license;PHP/license
+ notes
+Added a LICENSE file to make it easier for PECL binary distributions
+to conform with the license.
+ /notes
+/release
+
+release
+ version
release2.0.5/release
api2.0.5/api
/version
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 7510415..86c5abf 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -45,7 +45,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION 2.0.6
+#define PHP_OCI8_VERSION 2.0.7-dev
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr oci8_module_entry
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed sapi/embed: sapi/embed/php_embed.c
Commit:4c68e810183f6b02ce7c2731ddecb4aca14c87f3
Author:Anatol Belski a...@php.net Sat, 14 Dec 2013 00:26:56 +0100
Parents: 009528ba439b6866ed498c40864ced33005e838c
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=4c68e810183f6b02ce7c2731ddecb4aca14c87f3
Log:
fixed sapi/embed
Changed paths:
M sapi/embed/php_embed.c
Diff:
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index 414b4db..0ed475c 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -44,10 +44,10 @@ static int php_embed_deactivate(TSRMLS_D)
return SUCCESS;
}
-static inline size_t php_embed_single_write(const char *str, uint str_length)
+static inline size_t php_embed_single_write(const char *str,
zend_str_size_uint str_length)
{
#ifdef PHP_WRITE_STDOUT
- long ret;
+ php_int_t ret;
ret = write(STDOUT_FILENO, str, str_length);
if (ret = 0) return 0;
@@ -61,10 +61,10 @@ static inline size_t php_embed_single_write(const char
*str, uint str_length)
}
-static int php_embed_ub_write(const char *str, uint str_length TSRMLS_DC)
+static zend_str_size_int php_embed_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;
size_t ret;
while (remaining 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'master' into str_size_and_int64: Zend/zend_API.c Zend/zend_API.h Zend/zend_compile.h Zend/zend_execute.c Zend/zend_object_handlers.c Zend/zend_vm_def.h Zend/zend_v
Commit:f806f4d0604f37799393c1a72fc5fdf12ca4f371 Author:Anatol Belski a...@php.net Fri, 13 Dec 2013 10:45:27 +0100 Parents: e0c7899dddf0606480ebaf84be6c43d7bd613c58 914de05bf59ba91d39b6b3f3e914fd2a456d0133 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f806f4d0604f37799393c1a72fc5fdf12ca4f371 Log: Merge branch 'master' into str_size_and_int64 Changed paths: MM Zend/zend_API.c MM Zend/zend_API.h MM Zend/zend_compile.h MM Zend/zend_execute.c MM Zend/zend_object_handlers.c MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/opcache/ZendAccelerator.c MM ext/opcache/ZendAccelerator.h MM ext/opcache/zend_accelerator_module.c MM main/main.c MM sapi/cgi/cgi_main.c MM sapi/cli/php_cli.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed ext/readline: ext/readline/readline.c
Commit:1040cdf8fc1e36381241342fbbc88ded93829a27
Author:Anatol Belski a...@php.net Fri, 13 Dec 2013 05:51:49 -0800
Parents: 985d8f0436bb6300c302a59dbfd66380029d9d6f
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=1040cdf8fc1e36381241342fbbc88ded93829a27
Log:
fixed ext/readline
Changed paths:
M ext/readline/readline.c
Diff:
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index d4032ca..6051858 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -211,10 +211,10 @@ PHP_MINFO_FUNCTION(readline)
PHP_FUNCTION(readline)
{
char *prompt = NULL;
- int prompt_len;
+ zend_str_size_int prompt_len;
char *result;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s!,
prompt, prompt_len)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |S!,
prompt, prompt_len)) {
RETURN_FALSE;
}
@@ -238,10 +238,11 @@ PHP_FUNCTION(readline_info)
{
char *what = NULL;
zval **value = NULL;
- int what_len, oldval;
+ zend_str_size_int what_len;
+ int oldval;
char *oldstr;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sZ, what,
what_len, value) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |SZ, what,
what_len, value) == FAILURE) {
return;
}
@@ -334,9 +335,9 @@ PHP_FUNCTION(readline_info)
PHP_FUNCTION(readline_add_history)
{
char *arg;
- int arg_len;
+ zend_str_size_int arg_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, arg,
arg_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, S, arg,
arg_len) == FAILURE) {
return;
}
@@ -389,9 +390,9 @@ PHP_FUNCTION(readline_list_history)
PHP_FUNCTION(readline_read_history)
{
char *arg = NULL;
- int arg_len;
+ zend_str_size_int arg_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |p, arg,
arg_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |P, arg,
arg_len) == FAILURE) {
return;
}
@@ -413,9 +414,9 @@ PHP_FUNCTION(readline_read_history)
PHP_FUNCTION(readline_write_history)
{
char *arg = NULL;
- int arg_len;
+ zend_str_size_int arg_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |p, arg,
arg_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |P, arg,
arg_len) == FAILURE) {
return;
}
@@ -576,9 +577,9 @@ PHP_FUNCTION(readline_callback_handler_install)
zval *callback;
char *name = NULL;
char *prompt;
- int prompt_len;
+ zend_str_size_int prompt_len;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz,
prompt, prompt_len, callback)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Sz,
prompt, prompt_len, callback)) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Can not push to git.php.net
Next time... send email to syst...@php.net Has much higher chance of being read by those who can fix it then sending it to a commit list :) -Hannes On Thu, Dec 12, 2013 at 9:56 PM, Laruence larue...@php.net wrote: Dsp: I can not push to 5.6 branch via g...@git.php.net:php-src.git the error message is: Total 4 (delta 3), reused 0 (delta 0) remote: error: insufficient permission for adding an object to repository database ./objects remote: fatal: failed to write object error: unpack failed: unpack-objects abnormal exit To g...@git.php.net:php-src.git ! [remote rejected] PHP-5.6 - PHP-5.6 (unpacker error) error: failed to push some refs to 'g...@git.php.net:php-src.git' but I can push to it via https://git.php.net/push/php-src.git Any ideas why? thanks -- Laruence Xinchen Hui http://www.laruence.com/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
bjoriFri, 13 Dec 2013 21:30:50 + Revision: http://svn.php.net/viewvc?view=revisionrevision=332358 Log: Daniel Lowrey wants to become a doc writer when he gets older. Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-12-13 18:11:44 UTC (rev 332357) +++ SVNROOT/global_avail2013-12-13 21:30:50 UTC (rev 332358) @@ -101,7 +101,7 @@ avail|aferreira,thiago|phpdoc/pt avail|machado,scar,davis,dnfeitosa,thiago,amandavale,rafa,klaussilveira,kinncj,malukenho,fibbarth|phpdoc/pt_BR avail|radical,shoty|phpdoc/ro -avail|aur,irker,oaass,ralphschindler,kazymjir,whatthejeff,dsas,philstu,kasparp|phpdoc/en +avail|aur,irker,oaass,ralphschindler,kazymjir,whatthejeff,dsas,philstu,kasparp,rdlowrey|phpdoc/en avail|freespace,shafff,sveta,wanderer,kozloffsky,santiago,seprize,irker,mch,aur,das,tmn,bfl,countzero,alien,northcat|phpdoc/ru avail|cumhuronat,gulenzek,xhandros,neoprobe,faruk,infralite,flarecaster,antimon,yelekin,ecamalan|phpdoc/tr avail|pfischer|phpdoc/es -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: revamp ext/dom: ext/dom/document.c
Commit:bdc565e67ad9cd1f14c987d2e54cd63653ce66a7
Author:Anatol Belski a...@php.net Thu, 12 Dec 2013 11:50:45 +0100
Parents: e0c7899dddf0606480ebaf84be6c43d7bd613c58
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=bdc565e67ad9cd1f14c987d2e54cd63653ce66a7
Log:
revamp ext/dom
Changed paths:
M ext/dom/document.c
Diff:
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 5bacc0f..04027d3 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -419,7 +419,7 @@ int dom_document_standalone_write(dom_object *obj, zval
*newval TSRMLS_DC)
{
zval value_copy;
xmlDoc *docp;
- int standalone;
+ php_int_t standalone;
docp = (xmlDocPtr) dom_object_get_node(obj);
@@ -553,7 +553,7 @@ int dom_document_strict_error_checking_write(dom_object
*obj, zval *newval TSRML
if (obj-document) {
doc_prop = dom_get_doc_props(obj-document);
- doc_prop-stricterror = Z_LVAL_P(newval);
+ doc_prop-stricterror = Z_BVAL_P(newval);
}
if (newval == value_copy) {
@@ -596,7 +596,7 @@ int dom_document_format_output_write(dom_object *obj, zval
*newval TSRMLS_DC)
if (obj-document) {
doc_prop = dom_get_doc_props(obj-document);
- doc_prop-formatoutput = Z_LVAL_P(newval);
+ doc_prop-formatoutput = Z_BVAL_P(newval);
}
if (newval == value_copy) {
@@ -638,7 +638,7 @@ int dom_document_validate_on_parse_write(dom_object *obj,
zval *newval TSRMLS_DC
if (obj-document) {
doc_prop = dom_get_doc_props(obj-document);
- doc_prop-validateonparse = Z_LVAL_P(newval);
+ doc_prop-validateonparse = Z_BVAL_P(newval);
}
if (newval == value_copy) {
@@ -680,7 +680,7 @@ int dom_document_resolve_externals_write(dom_object *obj,
zval *newval TSRMLS_DC
if (obj-document) {
doc_prop = dom_get_doc_props(obj-document);
- doc_prop-resolveexternals = Z_LVAL_P(newval);
+ doc_prop-resolveexternals = Z_BVAL_P(newval);
}
if (newval == value_copy) {
@@ -722,7 +722,7 @@ int dom_document_preserve_whitespace_write(dom_object *obj,
zval *newval TSRMLS_
if (obj-document) {
doc_prop = dom_get_doc_props(obj-document);
- doc_prop-preservewhitespace = Z_LVAL_P(newval);
+ doc_prop-preservewhitespace = Z_BVAL_P(newval);
}
if (newval == value_copy) {
@@ -764,7 +764,7 @@ int dom_document_recover_write(dom_object *obj, zval
*newval TSRMLS_DC)
if (obj-document) {
doc_prop = dom_get_doc_props(obj-document);
- doc_prop-recover = Z_LVAL_P(newval);
+ doc_prop-recover = Z_BVAL_P(newval);
}
if (newval == value_copy) {
@@ -806,7 +806,7 @@ int dom_document_substitue_entities_write(dom_object *obj,
zval *newval TSRMLS_D
if (obj-document) {
doc_prop = dom_get_doc_props(obj-document);
- doc_prop-substituteentities = Z_LVAL_P(newval);
+ doc_prop-substituteentities = Z_BVAL_P(newval);
}
if (newval == value_copy) {
@@ -1032,6 +1032,11 @@ PHP_FUNCTION(dom_document_create_cdatasection)
return;
}
+ if (value_len INT_MAX) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Input value is too
long);
+ RETURN_FALSE;
+ }
+
DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
node = xmlNewCDataBlock(docp, (xmlChar *) value, value_len);
@@ -1562,8 +1567,8 @@ static xmlDocPtr dom_document_parser(zval *id, int mode,
char *source, int sourc
dom_object *intern;
php_libxml_ref_obj *document = NULL;
int validate, recover, resolve_externals, keep_blanks, substitute_ent;
- int resolved_path_len;
- int old_error_reporting = 0;
+ zend_str_size_int resolved_path_len;
+ php_int_t old_error_reporting = 0;
char *directory=NULL, resolved_path[MAXPATHLEN];
if (id != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
