Commit Graph

8986 Commits

Author SHA1 Message Date
Anatol Belski
b9f1daa976 basic clang compatibility on windows 2014-11-07 10:17:59 +01:00
Bob Weinand
90b4ec51ad Fix bad merge 2014-11-04 18:23:20 +01:00
Bob Weinand
ad8ee74225 Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
	ext/standard/file.c
2014-11-04 17:16:49 +01:00
Bob Weinand
342d56b23d arg1-3 are not variable names to use; removed useless buffer variable 2014-11-04 16:59:32 +01:00
Anatol Belski
d77ce31763 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix output globals importing
  export output globals
  use portable strndup implementation
  unix sockets aren't available on windows
  dll export APIs needed by phpdbg
  fix sapi/phpdbg/config.w32
  Don't treat warnings as failures in the junit output
2014-10-29 20:04:56 +01:00
Anatol Belski
fdbfcc0b51 dll export APIs needed by phpdbg 2014-10-29 19:32:52 +01:00
Matteo Beccati
551cb82a59 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now
2014-10-29 11:32:57 +01:00
Matteo Beccati
eb4e4b7bca Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

Conflicts:
	configure.in
	main/php_version.h
2014-10-29 11:32:12 +01:00
Matteo Beccati
daf9357d27 Fixed test to work with recent libcurl versions 2014-10-29 11:28:27 +01:00
Anatol Belski
e7945419dd fix datatype mismatches 2014-10-28 17:24:56 +01:00
Anatol Belski
11b119d526 fix datatype mismatches 2014-10-27 16:38:47 +01:00
Anatol Belski
0a5b7d1316 refix the broken place
typecast from signed to unsigned of a bigger size
2014-10-25 02:13:44 +02:00
Anatol Belski
010f4b7979 fix infinite loop 2014-10-25 00:32:45 +02:00
Anatol Belski
2af99b1866 fix datatype mismatch warnings 2014-10-24 20:50:03 +02:00
Anatol Belski
9ccc3a0c3c fix datatype mismatch warning 2014-10-24 20:50:02 +02:00
Anatol Belski
ff02a1416e fix datatype mismatches 2014-10-24 20:50:01 +02:00
Anatol Belski
4cb58a3936 fix datatype mismatch warnings 2014-10-24 20:50:00 +02:00
Anatol Belski
53560ca06b rework the previous fix for var names with size_t, no ugly casts anymore 2014-10-23 16:50:35 +02:00
Anatol Belski
4fa92438f4 fix datatype mismatches 2014-10-23 16:38:25 +02:00
Anatol Belski
5b9f3a24d6 fix datatype mismatch 2014-10-23 16:31:19 +02:00
Anatol Belski
99e236e3cc fix datatype mismatches 2014-10-23 16:29:02 +02:00
Anatol Belski
744c19eed8 fix datatype mismatches 2014-10-23 16:22:20 +02:00
Anatol Belski
df6aff48a6 fix pack64.phpt related fail on win64 2014-10-23 15:47:47 +02:00
Anatol Belski
f375b530bb fix datatype mismatches 2014-10-23 15:47:46 +02:00
Anatol Belski
4f9bb66e99 fix datatype mismatch 2014-10-23 15:47:45 +02:00
Anatol Belski
29b43af072 exhaust zend_long/size_t potential in levenstein 2014-10-23 15:47:44 +02:00
Anatol Belski
88ca46d92b fix datatype mismatches 2014-10-23 11:45:44 +02:00
Anatol Belski
f010efc924 fix datatype mismatches 2014-10-23 11:36:34 +02:00
Anatol Belski
91652cf3c7 fix datatype mismatches 2014-10-23 11:05:47 +02:00
Anatol Belski
451065a434 fix datatype mismatches 2014-10-23 10:30:05 +02:00
Anatol Belski
0413a6e7a3 fix datatype mismatches 2014-10-23 10:30:04 +02:00
Anatol Belski
c448023bd0 fix datatype mismatches 2014-10-23 10:30:03 +02:00
Anatol Belski
a61f6ab737 fix datatype mismatches 2014-10-23 10:30:02 +02:00
Anatol Belski
50cc4abbf7 fix datatype mismatch 2014-10-23 10:30:00 +02:00
Anatol Belski
303973f076 fix datatype mismatches 2014-10-23 10:29:59 +02:00
Anatol Belski
ddaae1a02c fix datatype mismatch 2014-10-23 10:29:58 +02:00
Anatol Belski
e91b669e23 catch up with the latest key length change 2014-10-23 10:29:55 +02:00
Anatol Belski
958c6d1c5d fix datatype mismatch warning 2014-10-22 20:46:35 +02:00
Anatol Belski
afb65adefa fix datatype mismatches 2014-10-22 20:46:34 +02:00
Anatol Belski
0565a29e4d fix datatype mismatches 2014-10-22 20:46:33 +02:00
Anatol Belski
58b8227240 fix assert, zero diff would be valid, too 2014-10-22 20:46:32 +02:00
Anatol Belski
5b4b0f8368 fix datatype mismatch warning 2014-10-22 20:46:31 +02:00
Anatol Belski
1a727e519b fix datatype mismatch warnings 2014-10-22 20:46:30 +02:00
Anatol Belski
b80853d942 fix datatype mismatches 2014-10-22 20:46:29 +02:00
Anatol Belski
a5e4f1f598 fix several datatype mismatches 2014-10-22 17:56:30 +02:00
Anatol Belski
cccd538512 fix dir separator in test 2014-10-22 17:56:29 +02:00
Anatol Belski
f58edcd996 fix datatype warnings 2014-10-22 17:56:28 +02:00
Anatol Belski
09a01a834e this should be uint32 2014-10-22 17:56:26 +02:00
Anatol Belski
36ce467402 fix datatype mismatches 2014-10-22 17:56:25 +02:00
Anatol Belski
1ea5982d07 fixing datatype mismatches 2014-10-22 17:56:23 +02:00