e39cc57bbd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Remove 550+ compile warnings on OS X
2014-08-29 08:48:56 -07:00
6fe0bdda9c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove 550+ compile warnings on OS X
2014-08-29 08:48:43 -07:00
9063188fad
Remove 550+ compile warnings on OS X
...
The warnings had the signature:
php-src/ext/mysqlnd/mysqlnd_debug.h:127:25: note: expanded from macro 'DBG_ENTER_EX2'
if (dbg_skip_trace); /* shut compiler's mouth */\
^
php-src/ext/mysqlnd/mysqlnd.c:114:2: note: put the semicolon on a separate line to silence this warning
2014-08-29 08:48:10 -07:00
a9c5dab1d0
revert the lstat part
2014-08-29 17:21:02 +02:00
f9b051241a
fix stat vs zend_stat
2014-08-29 13:43:40 +02:00
13ccda7249
fix implicit st_rdev element handling when negative value was passed
2014-08-29 13:30:53 +02:00
451856420c
data type fixes
2014-08-29 12:53:37 +02:00
e206409a8c
exclude log2 usage which requires C99 support
2014-08-29 10:55:55 +02:00
c14b3d5d82
fixed path in test
2014-08-29 08:41:29 +02:00
b2d2b965b2
resource type is int
2014-08-29 11:28:21 +08:00
389d285973
Special-case aliases, add warning comments to implementations
2014-08-29 00:10:52 +02:00
5fc0006d35
skip this if we can't check the uid
2014-08-28 22:22:38 +02:00
898e1570a2
fixed trim() and strtok() to work with big strings
2014-08-28 21:59:00 +02:00
8e05b9104b
fixed strip_tags() and hebrev() to work with big strings
2014-08-28 19:35:37 +02:00
c8ff3421a0
Duplicate array only if neccessary
2014-08-28 20:51:22 +04:00
7faac0267f
Merge branch 'master' of git.php.net:php-src
...
# By Popa Adrian Marius
# Via Popa Adrian Marius
* 'master' of git.php.net:php-src:
rename misleading define
2014-08-28 17:39:03 +02:00
f4e04b9fb1
fix phar copy-on-write
2014-08-28 17:35:54 +02:00
e41754b7d8
rename misleading define
2014-08-28 18:20:28 +03:00
9f1b68eda5
fix incompatible pointer
2014-08-28 17:03:41 +02:00
59286f89f7
solve conflicting type size_t vs int
2014-08-28 17:10:42 +03:00
3447d465af
Use better hash functions
2014-08-28 17:47:40 +04:00
234af84c04
Refactored optimizer (compile different opimizer passes separately, instead of including *.c file)
2014-08-28 17:23:12 +04:00
a502639412
remove the expression parts, which are always true
2014-08-28 11:38:23 +02:00
e831de3024
fix some types and unnecessary casts
2014-08-28 11:38:22 +02:00
0b04843573
fix type
2014-08-28 11:38:21 +02:00
d2e416a90b
fix pg_last_notice()
2014-08-28 10:45:47 +02:00
aa161f0723
Changed 'unsigned size_t' to 'size_t'
2014-08-28 16:39:35 +08:00
bc3d9b3ba2
Fixed segfaults after change size_t of "s"
2014-08-28 15:43:14 +08:00
697472e3e1
Merge branch 'master' of https://git.php.net/repository/php-src
2014-08-28 14:56:53 +08:00
de4282fa3e
Revert "Fixed incompatible pointer type"
...
This reverts commit 007406c775
2014-08-28 14:56:25 +08:00
a4532f6d4d
fix hash_pbkdf2()
2014-08-28 08:55:05 +02:00
a038ab892f
Fixed type
2014-08-28 10:31:13 +04:00
88fdb5f084
Fixed iconv MINFO
2014-08-28 13:11:07 +08:00
007406c775
Fixed incompatible pointer type
2014-08-28 11:34:00 +08:00
f2b0370193
Use 'const' qualifier for pointrs to code used at run-time (the code must not be changed)
2014-08-28 02:44:06 +04:00
ca0069bc33
fix remaining 's' args for pgsql
2014-08-28 00:21:12 +02:00
dadbbf8945
Fix compilation on systems without ecdh_curve
2014-08-28 00:12:48 +02:00
7d6c3e01c9
fix remaining 's' args for openssl
2014-08-28 00:05:29 +02:00
734e11cca7
fixed remaining 's' args for ftp
2014-08-27 23:56:19 +02:00
cf430b9a6f
fix linkinfo()
2014-08-27 23:44:28 +02:00
e6dcd19aed
restore the old part of ezmlm_hash()
2014-08-27 23:14:54 +02:00
0e41927ca0
fixed UConverter::convert()
2014-08-27 23:03:58 +02:00
a1a4a6101c
fix typo
2014-08-27 22:47:13 +02:00
2ee3ec999b
fixed php_wddx_packet_start signature
2014-08-27 22:45:19 +02:00
f099c3f2ec
Merge branch 'PHP-5.6'
2014-08-27 22:18:55 +02:00
60373b2ac2
fix signature
2014-08-27 22:17:16 +02:00
fc5f931663
Fix bug #67917 (gmp compound assignment operator leak)
2014-08-27 22:16:20 +02:00
232459efd0
fix signature
2014-08-27 22:13:01 +02:00
074c68e9ce
fix signature
2014-08-27 22:05:26 +02:00
039f512289
fix signature
2014-08-27 22:01:43 +02:00
Christopher Jones