Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
1387a679
Commit
1387a679
authored
Mar 21, 2017
by
Paul Yang
Committed by
GitHub
Mar 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update commit number in Docker to update composer dependency (#2869)
parent
ffa932bf
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
Dockerfile
jenkins/docker/Dockerfile
+1
-1
Dockerfile
jenkins/docker32/Dockerfile
+1
-1
array.c
php/ext/google/protobuf/array.c
+1
-1
map.c
php/ext/google/protobuf/map.c
+1
-1
type_check.c
php/ext/google/protobuf/type_check.c
+4
-2
No files found.
jenkins/docker/Dockerfile
View file @
1387a679
...
...
@@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode
RUN
cd
/tmp
&&
\
git clone https://github.com/google/protobuf.git
&&
\
cd
protobuf
&&
\
git reset
bf379715c93b581eeb078cec1f0dd8a7d79df43
1
&&
\
git reset
6b27c1f981a9a93918e4039f236ead27165a8e9
1
&&
\
./autogen.sh
&&
\
./configure
&&
\
make
-j4
&&
\
...
...
jenkins/docker32/Dockerfile
View file @
1387a679
...
...
@@ -64,7 +64,7 @@ RUN php -r "unlink('composer-setup.php');"
RUN
cd
/tmp
&&
\
git clone https://github.com/google/protobuf.git
&&
\
cd
protobuf/php
&&
\
git reset
46ae90dc5e145b12fffa7e053a908a9f3e066286
&&
\
git reset
6b27c1f981a9a93918e4039f236ead27165a8e91
&&
\
ln
-sfn
/usr/bin/php5.5 /usr/bin/php
&&
\
ln
-sfn
/usr/bin/php-config5.5 /usr/bin/php-config
&&
\
ln
-sfn
/usr/bin/phpize5.5 /usr/bin/phpize
&&
\
...
...
php/ext/google/protobuf/array.c
View file @
1387a679
...
...
@@ -230,7 +230,7 @@ void repeated_field_create_with_field(zend_class_entry *ce,
zval
**
repeated_field
TSRMLS_DC
)
{
upb_fieldtype_t
type
=
upb_fielddef_type
(
field
);
const
zend_class_entry
*
msg_ce
=
field_type_class
(
field
TSRMLS_CC
);
repeated_field_create_with_type
(
ce
,
type
,
msg_ce
,
repeated_field
);
repeated_field_create_with_type
(
ce
,
type
,
msg_ce
,
repeated_field
TSRMLS_CC
);
}
void
repeated_field_create_with_type
(
zend_class_entry
*
ce
,
...
...
php/ext/google/protobuf/map.c
View file @
1387a679
...
...
@@ -247,7 +247,7 @@ void map_field_create_with_field(zend_class_entry *ce, const upb_fielddef *field
const
upb_fielddef
*
value_field
=
map_field_value
(
field
);
map_field_create_with_type
(
ce
,
upb_fielddef_type
(
key_field
),
upb_fielddef_type
(
value_field
),
field_type_class
(
value_field
TSRMLS_CC
),
map_field
);
field_type_class
(
value_field
TSRMLS_CC
),
map_field
TSRMLS_CC
);
}
void
map_field_create_with_type
(
zend_class_entry
*
ce
,
upb_fieldtype_t
key_type
,
...
...
php/ext/google/protobuf/type_check.c
View file @
1387a679
...
...
@@ -439,7 +439,8 @@ PHP_METHOD(Util, checkRepeatedField) {
zend_hash_get_current_data_ex
(
table
,
(
void
**
)
&
memory
,
&
pointer
)
==
SUCCESS
;
zend_hash_move_forward_ex
(
table
,
&
pointer
))
{
repeated_field_handlers
->
write_dimension
(
repeated_field
,
NULL
,
*
(
zval
**
)
memory
);
repeated_field_handlers
->
write_dimension
(
repeated_field
,
NULL
,
*
(
zval
**
)
memory
TSRMLS_CC
);
}
Z_DELREF_P
(
repeated_field
);
...
...
@@ -497,7 +498,8 @@ PHP_METHOD(Util, checkMapField) {
SUCCESS
;
zend_hash_move_forward_ex
(
table
,
&
pointer
))
{
zend_hash_get_current_key_zval_ex
(
table
,
&
key
,
&
pointer
);
map_field_handlers
->
write_dimension
(
map_field
,
&
key
,
*
(
zval
**
)
value
);
map_field_handlers
->
write_dimension
(
map_field
,
&
key
,
*
(
zval
**
)
value
TSRMLS_CC
);
}
Z_DELREF_P
(
map_field
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment