Anatol Belski
a1208b4726
use size_t for str length
2015-02-09 10:43:27 +01:00
Anatol Belski
6747c166d8
generate missing json files from config.w32
2015-02-09 10:12:26 +01:00
Bob Weinand
fc444fbc70
Shut up, my lovely compiler; I do not like your warnings
...
Conflicts:
Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
Márcio Almada
e9f99e3d71
Márcio Almada remove dead tokens: T_CHARACTER, T_BAD_CHARACTER.
2015-02-08 21:44:44 -03:00
Michael Wallner
3121116a93
fix detection of mbstate_t with clang
...
AC_TRY_COMPILE expexts a function body
2015-02-08 21:46:16 +01:00
Jakub Zelenka
f2825042b4
Merge branch 'master' into jsond
...
Conflicts:
ext/json/json.c
2015-02-08 14:08:31 +00:00
Anatol Belski
ce9f52adcd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
moved the part of the test into an appropriate place
2015-02-08 14:13:39 +01:00
Anatol Belski
979020fcad
moved the part of the test into an appropriate place
2015-02-08 14:10:52 +01:00
Matteo Beccati
b32458f0c9
Removed unused REGISTER_PDO_CONST_LONG
2015-02-08 13:31:01 +01:00
Anatol Belski
371db55871
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix another invalid free of CG(interned_empty_string)
add tests for #68996
Fixed #68790 (Missing return)
Invalid free of CG(interned_empty_string)
Conflicts:
ext/soap/soap.c
ext/wddx/wddx.c
main/main.c
sapi/litespeed/lsapi_main.c
2015-02-08 12:43:22 +01:00
Anatol Belski
ffdc2c4123
Merge branch 'pull-request/1060' into PHP-5.6
2015-02-08 12:33:15 +01:00
manuel
cc13d8696f
Fix another invalid free of CG(interned_empty_string)
...
Fixes #68214
2015-02-07 19:17:31 +01:00
manuel
3550cc5fd9
add tests for #68996
2015-02-07 18:52:26 +01:00
Anatol Belski
1c331d8d39
added ODBCVER to phpinfo()
2015-02-07 11:23:50 +01:00
Anatol Belski
be718e45b0
added PCRE JIT availability info to phpinfo()
...
and a test to ensure it's enabled
2015-02-07 11:04:53 +01:00
William Felipe Welter
bb3a81c4b4
Fixed bug #68638 pg_update() fails to store infinite values.
...
Add quotes only if "infinity" values are received.
2015-02-07 01:26:12 -02:00
Anatol Belski
47af2381eb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix setting default ODBCVER value in config.w32
2015-02-06 20:00:26 +01:00
Anatol Belski
464667153d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix setting default ODBCVER value in config.w32
2015-02-06 19:59:55 +01:00
Anatol Belski
9bf95d8291
fix setting default ODBCVER value in config.w32
2015-02-06 19:59:14 +01:00
Anatol Belski
d0319e60b9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
2015-02-06 19:05:43 +01:00
Anatol Belski
e46e208819
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
2015-02-06 19:05:13 +01:00
Anatol Belski
a41aa46759
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
...
This is done in two steps:
- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
Server 9, otherwise the client will not recognize several SQL
datatypes
- additionally the config scripts was tweaked so then ODBCVER
can be overridden, that still allows enabling compatibility
with lower versions
Bug #67437 might be fixed by this as well.
2015-02-06 19:00:27 +01:00
manuel
13fc7f20a4
Invalid free of CG(interned_empty_string)
...
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
2015-02-06 16:53:01 +01:00
Xinchen Hui
2bdf8d30b4
Merge branch 'master' of https://github.com/mabes/php-src
2015-02-06 22:43:11 +08:00
Maxime BESSON
f384971552
Look for PDO include files in the right folder
...
Configure scripts for extensions look for PDO include files in
$prefix/include/php. This change makes them look into $phpincludedir
instead, which may be different from $prefix/include/php.
2015-02-06 12:06:29 +01:00
Dmitry Stogov
da5439b9c8
Re-enable PCRE JIT disabled by b436c714c6
2015-02-06 14:02:15 +03:00
Anatol Belski
20a194a92c
Merge branch 'pull-request/1047'
2015-02-06 11:18:46 +01:00
Anatol Belski
63761ab91e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Removed erroneous condition
2015-02-06 09:42:41 +01:00
Anatol Belski
9ef0c39b2b
Removed erroneous condition
...
This condition is always false. Furthermore headers_list() is
documented to always return an array.
2015-02-06 09:41:02 +01:00
Stanislav Malyshev
928fdbea08
fix tests
2015-02-05 21:54:47 -08:00
Stanislav Malyshev
93f0b8142b
fix BC break in headers_list
2015-02-05 20:24:16 -08:00
Stanislav Malyshev
c3eac70c76
Update header handling to RFC 7230
2015-02-05 20:10:28 -08:00
Stanislav Malyshev
a1c28567c6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update header handling to RFC 7230
2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update header handling to RFC 7230
2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073
Update header handling to RFC 7230
2015-02-05 20:08:12 -08:00
William Felipe Welter
b64f149176
Test case Bug #68638 pg_update() fails to store infinite values
2015-02-05 13:19:52 -02:00
Xinchen Hui
e82e22e27b
Opcache is enable by default
2015-02-05 17:07:30 +08:00
Xinchen Hui
a071fc4604
Added CREDITS
2015-02-05 16:58:19 +08:00
Stanislav Malyshev
e9822e090d
fix test to not hit php.net
2015-02-05 00:42:11 -08:00
Stanislav Malyshev
d33f4c6eb8
fix test to not hit php.net
2015-02-05 00:41:51 -08:00
Stanislav Malyshev
ee864f3301
fix test to not hit php.net
2015-02-05 00:11:44 -08:00
Anatol Belski
067902daee
fix data type mismatch
2015-02-04 18:13:29 +01:00
Anatol Belski
4a1e4e2870
fix unitialized val usage
2015-02-04 18:13:28 +01:00
Anatol Belski
b5d3c5ca8d
follow up fix for headers sent, checking a reference would be always true as well
2015-02-04 18:13:27 +01:00
Anatol Belski
1b87f31ba8
remove unused variable
2015-02-04 18:13:26 +01:00
Anatol Belski
430514e33d
fix wars about importing of locally defined symbols
2015-02-04 18:13:25 +01:00
Anatol Belski
614a628ace
fix data type
2015-02-04 18:13:24 +01:00
Julien Pauli
583af4979b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
2015-02-04 17:39:34 +01:00
Julien Pauli
f51b73c833
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
...
This reverts commit 8e19705a93
.
2015-02-04 17:39:16 +01:00
Brad Broerman
dddbe0fc33
Update xp_ssl.c
...
Added TSRMLS_CC to php_openssl_sockop_io calls.
2015-02-04 10:13:36 -05:00
Arjen Schol
b436c714c6
Upgrade pcre to 8.36
2015-02-04 14:08:41 +01:00
Dmitry Stogov
9e70d7672d
Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
2015-02-04 15:24:13 +03:00
Julien Pauli
93315c4e1d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
2015-02-04 12:48:57 +01:00
Julien Pauli
c85f12e3ac
Revert "json_decode() should generate a syntax error when given ""."
...
This reverts commit a7b3abe4e6
.
2015-02-04 12:48:17 +01:00
Dmitry Stogov
2428fd1c8b
Use object pointers instead of handles
2015-02-04 12:01:55 +03:00
Xinchen Hui
17286ab869
Attempt to port odbc
2015-02-04 13:58:22 +08:00
Xinchen Hui
6fe8dce671
Merge branch 'resource-api' of https://github.com/laruence/php-src
2015-02-04 11:39:57 +08:00
William Felipe Welter
cb3833a3be
Fixed bug #68638 pg_update() fails to store infinite values.
...
Regex to check float values changed to accept "infinity" values
and ignore case. Quotes are added to prevent syntax error on
PostgreSQL.
2015-02-03 22:47:05 -02:00
Yasuo Ohgaki
dbb1298fdb
Fixed typos in comments
2015-02-04 05:00:03 +09:00
Jakub Zelenka
0a81f9a0bd
Merge branch 'master' into jsond
2015-02-03 19:27:24 +00:00
Anatol Belski
55cefb2814
fix condition
...
the headers member is allocated together with the SAPI globals struct
2015-02-03 17:52:19 +01:00
Anatol Belski
73a6e7e24a
fix int to void * cast
2015-02-03 17:52:18 +01:00
Anatol Belski
fe39840450
fix incompatible pointer type warning
2015-02-03 17:52:17 +01:00
Xinchen Hui
6c7d3ce09a
Fixed pgsql tests
2015-02-03 23:50:58 +08:00
Xinchen Hui
38829b3b4b
Merge branch 'master' into resource-api
2015-02-03 23:01:48 +08:00
Xinchen Hui
5a5c855154
attempt to port oci
2015-02-03 22:17:25 +08:00
Xinchen Hui
64caa97e02
Fixed test fails
2015-02-03 22:09:37 +08:00
Xinchen Hui
2c842dfce0
Fixed shmop tests fails
2015-02-03 22:07:31 +08:00
Xinchen Hui
d4546601f3
Fixed mysql tests fails
2015-02-03 22:04:24 +08:00
Yasuo Ohgaki
30b4a32e09
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Bug #65199 pg_copy_from() modifies input array variable
Conflicts:
ext/pgsql/pgsql.c
2015-02-03 15:40:59 +09:00
Yasuo Ohgaki
36f73412c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #65199 pg_copy_from() modifies input array variable
2015-02-03 15:27:19 +09:00
Yasuo Ohgaki
f8a8ccaba2
Fixed Bug #65199 pg_copy_from() modifies input array variable
2015-02-03 15:26:02 +09:00
Xinchen Hui
0d4255de30
Ported pgsql
2015-02-03 13:51:04 +08:00
Yasuo Ohgaki
1aa6242dcf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
Conflicts:
ext/session/mod_files.c
2015-02-03 14:07:23 +09:00
Yasuo Ohgaki
4dd7851208
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
2015-02-03 14:04:03 +09:00
Yasuo Ohgaki
b41a6c6f05
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
2015-02-03 14:02:58 +09:00
Yasuo Ohgaki
5afe554d32
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68063 Empty session IDs do still start sessions
Conflicts:
ext/session/session.c
ext/session/tests/bug61470.phpt
2015-02-03 13:49:14 +09:00
Yasuo Ohgaki
2983ef3c48
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:41:31 +09:00
Yasuo Ohgaki
853ae39d6e
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:38:49 +09:00
Xinchen Hui
5c87488a70
Ported dba
2015-02-03 12:07:36 +08:00
Xinchen Hui
efc75061ed
Ported wddx
2015-02-03 12:02:28 +08:00
Xinchen Hui
2517b56cd1
Ported mcrypt
2015-02-03 11:58:11 +08:00
Yasuo Ohgaki
665997bf16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #61470 is fixed only in master
2015-02-03 12:26:25 +09:00
Yasuo Ohgaki
17beba686e
Bug #61470 is fixed only in master
2015-02-03 12:26:01 +09:00
Yasuo Ohgaki
e93042998a
Fixed bug #61470 - session_regenerate_id() does not create session file.
...
Made session_regenerate_id() raise error for wrong usage.
2015-02-03 12:23:00 +09:00
Jakub Zelenka
c3cd2d33ca
Fix invalid test for bug 54484
2015-02-02 20:53:27 +00:00
Jakub Zelenka
fdc14c64be
Add re2c sources
2015-02-02 19:55:29 +00:00
Jakub Zelenka
3e4c1717ee
Merge branch 'master' into jsond
2015-02-02 19:53:32 +00:00
Jakub Zelenka
20bae2a503
Give me credit
2015-02-02 19:33:48 +00:00
Yasuo Ohgaki
92576c7c49
XFAIL broken test for now.
...
Partially fixed test session.save_path difference.
2015-02-03 03:05:03 +09:00
Daniel Lowrey
37ace4ad89
Merge branch 'PHP-5.6'
...
Conflicts:
ext/standard/file.c
2015-02-02 10:58:39 -05:00
Daniel Lowrey
f86600c167
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/standard/file.c
2015-02-02 10:52:27 -05:00
Daniel Lowrey
f2f467bd96
Fixed bug #65272 : correctly set flock() out param in windows
2015-02-02 10:47:54 -05:00
Adam Harvey
fea4c22266
Merge branch 'PHP-5.6'
2015-02-02 11:32:03 +00:00
Adam Harvey
05d591dfdf
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-02 11:31:54 +00:00
Adam Harvey
9d8b1170aa
Let's not assume bash is always /bin/bash.
2015-02-02 11:31:10 +00:00
Adam Harvey
9e20b64a5b
Merge branch 'PHP-5.6'
2015-02-02 11:12:27 +00:00
Adam Harvey
db375cfd4d
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-02 11:11:05 +00:00
Adam Harvey
a7b3abe4e6
json_decode() should generate a syntax error when given "".
...
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
2015-02-02 11:07:34 +00:00
Yasuo Ohgaki
c7eea5a79b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add test for bug #61470 . It is already fixed.
2015-02-02 18:41:25 +09:00
Yasuo Ohgaki
675a12bbcf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:48 +09:00
Yasuo Ohgaki
fb803ff819
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:07 +09:00
Xinchen Hui
d1559dac04
Ported enchant
2015-02-02 16:33:57 +08:00
Yasuo Ohgaki
f248df9003
Cleanup trans sid code. Behavior is unchanged.
...
Fixed possible injections. Escape values usually internal safe values.
2015-02-02 17:06:16 +09:00
Xinchen Hui
7b41f4a41a
Ported ldap
2015-02-02 15:05:20 +08:00
Xinchen Hui
e98caf27ea
found type is unnecessary
2015-02-02 14:45:19 +08:00
Xinchen Hui
50ae5b31b4
Ported imap
2015-02-02 14:35:50 +08:00
Xinchen Hui
f1981365f5
Fixed #68966 (php7 make file ext/session/mod_mm.lo failed)
2015-02-02 14:24:41 +08:00
Xinchen Hui
7ec8eb380d
Use resource directly
2015-02-02 13:56:20 +08:00
Xinchen Hui
38efb690c0
Ported ftp
2015-02-02 13:53:03 +08:00
Xinchen Hui
942809909e
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
Xinchen Hui
c9e44dc2df
Revert "Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"""
...
This reverts commit e78dd7ade2
.
2015-02-02 10:32:26 +08:00
Stanislav Malyshev
bf55a4e223
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix sizeof size
2015-02-01 12:42:00 -08:00
Stanislav Malyshev
969e389121
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix sizeof size
2015-02-01 12:41:33 -08:00
Stanislav Malyshev
0bfcc2829c
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
- Updated to version 2015.1 (2015a)
2015-02-01 12:41:10 -08:00
Stanislav Malyshev
f66f5b2ffa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix sizeof size
2015-02-01 12:41:00 -08:00
Stanislav Malyshev
7efbd70b03
fix sizeof size
2015-02-01 12:40:38 -08:00
Derick Rethans
437719f7cc
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:23 +00:00
Derick Rethans
263fb375bd
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:21 +00:00
Derick Rethans
4d28d12f86
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:19 +00:00
Stanislav Malyshev
463611714c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
2015-02-01 00:09:04 -08:00
Martin Jansen
de31324c22
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
...
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to also have
the loader disabled.
With this change the loader is explicitely enabled in the request init
phase.
2015-02-01 00:08:35 -08:00
Stanislav Malyshev
d893814b58
Merge branch 'pull-request/1019'
...
* pull-request/1019:
Fix typos
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
2015-02-01 00:03:26 -08:00
Stanislav Malyshev
911f0ea417
Merge branch 'pull-request/1012'
...
* pull-request/1012:
Fix uninitalized variables reads. See CWE-457 for more info.
2015-01-31 23:52:10 -08:00
Stanislav Malyshev
87d8e9208c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix TSRM
Conflicts:
ext/standard/dns.c
2015-01-31 23:35:11 -08:00
Stanislav Malyshev
55d5811f85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TSRM
2015-01-31 23:34:44 -08:00
Stanislav Malyshev
d82424b46f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TSRM
2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78
fix TSRM
2015-01-31 23:34:14 -08:00
Stanislav Malyshev
b64cafdb9e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:17:24 -08:00
Danack
dbc0a80b23
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:13:55 -08:00
Stanislav Malyshev
e8e0481755
Merge branch 'pull-request/994'
...
* pull-request/994:
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:12:00 -08:00
Stanislav Malyshev
d6b1865007
Merge branch 'pull-request/988'
...
* pull-request/988:
remove PHP4 extension structure compat
2015-01-31 23:11:18 -08:00
Stanislav Malyshev
dd15207dc5
Merge branch 'pull-request/945'
...
* pull-request/945:
Update zend_accelerator_hash.c
hashmap sizes
Wasted Shared Memory aboce 2Gb fix
2015-01-31 23:10:37 -08:00
Stanislav Malyshev
c408c80886
Merge branch 'pull-request/989'
...
* pull-request/989:
Fix a few tests and remove error/warning for *0
Fix spaces -> tabs
Add deprecated notice to invalid DES salts.
2015-01-31 22:04:39 -08:00
Stanislav Malyshev
141b14454c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -08:00
Stanislav Malyshev
882a375dba
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:04:55 -08:00
Yasuo Ohgaki
d8803d8147
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed typo in comment
2015-02-01 05:15:27 +09:00
Yasuo Ohgaki
d9a9afa499
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed typo in comment
2015-02-01 05:14:56 +09:00
Yasuo Ohgaki
c8a12508c7
Fixed typo in comment
2015-02-01 05:14:27 +09:00
Michael Wallner
0d267bdecc
Merge branch 'close_cor' of github.com:MegaManSec/php-src
...
* 'close_cor' of github.com:MegaManSec/php-src:
Fix interbase va_start
2015-01-30 23:05:10 +01:00
Michael Wallner
3c4540dec9
fix warnings
2015-01-30 22:49:44 +01:00
Michael Wallner
7a94243402
fix warnings
2015-01-30 22:19:23 +01:00
Michael Wallner
960d103d63
fix warnings
2015-01-30 21:36:23 +01:00