clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,422 Commits 491 Branches 1,363 Tags 846 MiB
5b4b0f8368
Commit Graph

36504 Commits

Author SHA1 Message Date
Anatol Belski
19f8217113 reduce struct size by 8 byte on 64 bit 2014-09-17 09:03:47 +02:00
Anatol Belski
d41ac22a54 avoid strlen() usage in the loop 2014-09-17 08:59:19 +02:00
Anatol Belski
d594809f27 fix printf fmt 2014-09-17 00:56:42 +02:00
Anatol Belski
dda7a01480 fix signed/unsigned mismatch 2014-09-17 00:56:40 +02:00
Anatol Belski
f2e728616c fix signed/unsigned mismatch warnings 2014-09-17 00:56:38 +02:00
Dmitry Stogov
551ee4165b Use runtime-cache to avoid hash lookups in BIND_GLOBAL instruction 2014-09-17 00:52:45 +04:00
Anatol Belski
7ba43ea052 fix signed/unsigned mismatch 2014-09-16 22:15:27 +02:00
Anatol Belski
8c4ab0d02e fix signed/unsigned mismatch 2014-09-16 21:17:27 +02:00
Anatol Belski
fc6f7bfcf3 fix signed/unsigned mismatch 2014-09-16 21:17:25 +02:00
Anatol Belski
5777aa51d9 fix signed/unsigned mismatch 2014-09-16 21:17:24 +02:00
Anatol Belski
95132bee40 redo the fix casting to size_t 2014-09-16 21:17:21 +02:00
Anatol Belski
49a6b485a0 redo the fix casting to size_t where applicable 2014-09-16 21:17:19 +02:00
Anatol Belski
db24742f01 fixed type 2014-09-16 21:17:18 +02:00
Anatol Belski
fba6e5a8cb fix signed/unsigned mismatch warnings 2014-09-16 21:17:16 +02:00
Anatol Belski
8240255e37 fixed signed/unsigned mismatch warning 2014-09-16 21:17:15 +02:00
Dmitry Stogov
f469dc7429 Improve opcache.fast_shutdown 2014-09-16 15:28:46 +04:00
Matteo Beccati
2508ce7aef Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed freetype test on multiple environments
 2014-09-16 10:23:03 +02:00
Matteo Beccati
24ed330a22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:49 +02:00
Matteo Beccati
b8470e19e4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a Fixed freetype test on multiple environments 
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)

This reverts commit 592df89027.
 2014-09-16 10:19:29 +02:00
Nikita Popov
079409bbc2 Switch (un)mangle property name to size_t and zend_string 
Also use the _ex variants where possible.
 2014-09-16 00:31:27 +02:00
Anatol Belski
8b2f15551d fix signed/unsigned mismatch warnings 2014-09-15 19:46:33 +02:00
Anatol Belski
066d39020b fix types 2014-09-15 19:46:32 +02:00
Anatol Belski
e591c78d09 revamp serialization to work with size_t for Serializable 2014-09-15 19:46:28 +02:00
Anatol Belski
172ca172d1 correct fix to the natcmp_ex 
Till now the actualy length diff between the strings was under
circumstances returned. Whereby for a compare function only return
values of (1, 0, -1) make sense. Thus the old behavior isn't
present anymore, natcmp_ex now behaves as a standard compare function.
 2014-09-15 12:58:46 +02:00
Anatol Belski
4c496a7f5b fix signature 2014-09-15 11:30:25 +02:00
Anatol Belski
e056d52acf fix type 2014-09-15 11:30:23 +02:00
Anatol Belski
140d99b467 fix condition 2014-09-15 11:30:22 +02:00
Anatol Belski
d65ead6471 fix type 2014-09-15 10:43:39 +02:00
Anatol Belski
32c46f44a8 avoid strlen usage in the loop 2014-09-15 00:39:55 +02:00
Anatol Belski
635a23128b better way to check for empty string 2014-09-14 22:07:38 +02:00
Anatol Belski
a7482fd2bf make xml_utf8_ encode/decode work with size_t 2014-09-14 21:38:46 +02:00
Anatol Belski
ad9dc75150 avoid strlen() usage in loop 2014-09-14 17:00:06 +02:00
Anatol Belski
29f8b21cd7 fix int overflow preserving the old behavior 2014-09-14 16:39:25 +02:00
Nikita Popov
ebc6da5628 zend_get_property_info takes a zend_string* now 2014-09-14 16:18:08 +02:00
Anatol Belski
734d0b6bfd use nice way to achieve the property name length 2014-09-14 15:09:54 +02:00
Anatol Belski
454548e440 make it safer for an array underrun 2014-09-14 15:03:52 +02:00
Anatol Belski
b6b376efe5 avoid repeated strlen() usage 2014-09-14 12:59:31 +02:00
Anatol Belski
f1ba5389cd reduce struct size by 8 bytes on 64 bit 2014-09-14 12:32:38 +02:00
Anatol Belski
0b40abf41d avoid repeated strlen() usage 2014-09-14 12:30:01 +02:00
Anatol Belski
cbf530c7c0 fix possible pointer truncation 2014-09-14 12:18:52 +02:00
Anatol Belski
8d075b6e4d better way to zero away sensitive data 
memset could be optimized away by the compiler
 2014-09-14 11:48:51 +02:00
Anatol Belski
041302a8f7 reduce struct size by 8 byte on 64 bit 2014-09-14 11:36:11 +02:00
Anatol Belski
a9c188fbc6 reduce struct size by 8 byte on 64 bit 2014-09-14 11:26:17 +02:00
Anatol Belski
101adecbcd reduce struct sizes by 8 bytes each on 64 bit 2014-09-14 11:13:17 +02:00
Anatol Belski
34e39783b1 remove useless casts and checks 2014-09-14 11:00:22 +02:00
Anatol Belski
77137b56b8 align 4 byte to the start of the word 2014-09-14 10:27:00 +02:00
Anatol Belski
ea4ab02446 fix conditions 
substraction from an unsigned
 2014-09-14 10:24:10 +02:00
Anatol Belski
65100a6474 reduce the struct size by 8 byte on 64 bit 2014-09-14 09:40:56 +02:00
Anatol Belski
27d0cfb8a7 reduce the struct size by 8 byte on 64 bit 2014-09-14 09:25:09 +02:00
Anatol Belski
273763dd63 reduce the struct size by 8 byte on 64 bit 2014-09-14 09:22:02 +02:00
Anatol Belski
cac71ecc93 reduce the struct size by 8 byte on 64 bit 2014-09-14 01:22:55 +02:00
Anatol Belski
35a2937e6b reduce the struct size by 8 byte on 64 bit 2014-09-14 01:12:12 +02:00
Anatol Belski
b056859d17 reduce the struct size by 8 byte on 64 bit 2014-09-14 00:59:46 +02:00
Anatol Belski
79f51bd1a0 use the generator to produce the header 2014-09-14 00:43:58 +02:00
Anatol Belski
da10603ec9 update the html table generator 2014-09-14 00:42:48 +02:00
Anatol Belski
26cf7df133 removed the emalloc result check, out of memory will bailout 2014-09-14 00:00:52 +02:00
Anatol Belski
7d194a0e0b replaced the check with assert as it's kinda unusual case 2014-09-13 23:57:53 +02:00
Anatol Belski
87a5aae166 removed extra 1 byte member, padding will be done anyway by the compiler 2014-09-13 23:55:30 +02:00
Anatol Belski
49e78dd022 reduce struct size by 8 byte on 64 bit 2014-09-13 23:34:08 +02:00
Anatol Belski
760c51a644 avoid usage of strlen() in the loop 2014-09-13 23:21:53 +02:00
Anatol Belski
a32e493d84 reduce struct size by 8 byte on 64 bit 2014-09-13 23:21:52 +02:00
Anatol Belski
2c66a8c53e better align reduce the struct size by 8 byte on 64 bit 2014-09-13 23:21:51 +02:00
Anatol Belski
58177c27d6 reduce the struct size (under circumstances) on 64 bit 2014-09-13 23:21:49 +02:00
Anatol Belski
a7690fea7a check if the winver was indeed fetched 2014-09-13 23:21:48 +02:00
Anatol Belski
bce562b75e check emalloc() result 2014-09-13 23:21:47 +02:00
Anatol Belski
e00d48490b better way to check for an empty string 2014-09-13 23:21:46 +02:00
Anatol Belski
f357628fc9 reduce the union size from 24 to 16 bytes on 64 bit 2014-09-13 23:21:44 +02:00
Anatol Belski
be9408f71a fix condition 
comparsion of two unsigned
 2014-09-13 23:21:43 +02:00
Anatol Belski
47fb7a46ac reduced struct sizes by 8 byte each on 64 bit 2014-09-13 23:21:39 +02:00
Anatol Belski
d578e351a9 fix condition 
substraction of two unsigned
 2014-09-13 23:21:38 +02:00
Anatol Belski
5092c5490a reduce struct sizes by 8 byte on 64 bit 2014-09-13 23:21:37 +02:00
Anatol Belski
1f9893d0ef avoid strlen() usage in the loop 2014-09-13 23:21:36 +02:00
Anatol Belski
98aeef6fac reduced the struct size by 8 byte on 64 bit 2014-09-13 12:49:10 +02:00
Anatol Belski
f8d75839aa reduce the struct size by 8 byte on 64 bit 2014-09-12 23:27:55 +02:00
Anatol Belski
e251ecb6e9 fix possible null ptr deref 2014-09-12 22:31:02 +02:00
Anatol Belski
7ac5a36a2f fix possible nullptr derefrence 2014-09-12 22:18:06 +02:00
Anatol Belski
5257ac4925 fix test which fails if prevous run cleanup failed 2014-09-12 21:35:24 +02:00
Anatol Belski
95a50f7322 fix type 2014-09-12 21:35:23 +02:00
Anatol Belski
03bf8c256b fix type 2014-09-12 21:35:22 +02:00
Anatol Belski
e68788745a fix type 2014-09-12 21:35:21 +02:00
Anatol Belski
7ea780dd6e fix type 2014-09-12 21:35:19 +02:00
Anatol Belski
4db2181d4e make this test a bit more tolerant when checking sleep time 2014-09-12 14:39:19 +02:00
Anatol Belski
99fb5d0ea8 remove extra semicolon 2014-09-12 14:39:18 +02:00
Anatol Belski
0292c34b05 Merge branch 'PHP-5.6' 
* PHP-5.6:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
  5.6.2 now

Conflicts:
	configure.in
	main/php_version.h
 2014-09-11 23:33:12 +02:00
Anatol Belski
13280a9e36 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
 2014-09-11 23:31:16 +02:00
Anatol Belski
69ea7f9509 reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0 2014-09-11 23:30:01 +02:00
Nikita Popov
fca85d92cc Fix ext/dba ini handling 
Doing this change blindly based on gcov output
 2014-09-11 16:06:31 +02:00
Nikita Popov
e2d4d700cf Fix yy_limit computation after encoding switch 
The three assignments above this line are still broken - they assume
that byte offsets in one encoding directly map to byte offsets in
another encoding.

I'm fixing the length here because it is the one causing out-of-bounds
reads and is easy to fix. For the others we'd have to actually compute
new offsets.
 2014-09-11 14:52:59 +02:00
Nikita Popov
f017843df3 Remove self-contradictory zend multibyte assertion 
Code that explicitly exists to handle an incompatible internal
encoding should not assert that the internal encoding is compatible.
 2014-09-11 14:52:59 +02:00
Dmitry Stogov
82096dc151 Removed ZEND_QM_ASSIGN_VAR and ZEND_JMP_SET_VAR opcodes (in PHPNG they did exacly the same as ZEND_QM_ASSIGN and ZEND_JMP_SET) 2014-09-11 12:29:54 +04:00
Dmitry Stogov
1981dd9c73 Revert "Removing ext/ereg and dependencies" 
This reverts commit 86de7963fe.
 2014-09-11 11:06:57 +04:00
Tjerk Meesters
86de7963fe Removing ext/ereg and dependencies 
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')

SAPI:
- apache (header only)
- apache_hooks (header only)
 2014-09-11 10:22:44 +08:00
Anatol Belski
e699f654f0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:32:25 +02:00
Anatol Belski
0b89bb83ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:31:59 +02:00
Anatol Belski
dff820cea3 fix precision when fetching float through mysqlnd 
fixes failing ext/mysqli/tests/010.phpt
 2014-09-10 19:29:11 +02:00
Anatol Belski
466a4c97b2 replace zend_hash_find with zend_hash_str_find which fixes leaking the key 2014-09-10 13:22:23 +02:00
Anatol Belski
e3ded277a5 second big shot on porting ext/oci8 
still a lot to do, but most raw things done
 2014-09-10 12:41:43 +02:00
Anatol Belski
686213a242 first shot on fixing ext/oci8 2014-09-10 12:41:42 +02:00
Anatol Belski
2e085df5c0 basic datatype fixes for ext/oci8 2014-09-10 12:41:41 +02:00
Matteo Beccati
205b6b8a13 Merge branch 'PHP-5.6' 
* PHP-5.6:
  FR #67990 - Added nowait argument to sem_acquire
 2014-09-10 07:32:36 +02:00
Matteo Beccati
0b648a424f FR #67990 - Added nowait argument to sem_acquire 2014-09-10 07:31:25 +02:00
Daniel Lowrey
13695a5ead Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:25:36 -06:00
Daniel Lowrey
edb2799333 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a Bug #41631: Fix regression from first attempt (6569db8) 2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4 Bug #67965: Fix blocking behavior in non-blocking crypto streams 2014-09-09 07:37:57 -06:00
Dmitry Stogov
a9d985263a We don't need to check for xlat entry twice 2014-09-09 00:40:14 +04:00
Dmitry Stogov
c59300ac86 Fixed GC problem (arrays may be recorded as possible root of garbage cycle. we have to clear this info before deleting array) 2014-09-09 00:12:36 +04:00
Adam Harvey
d91717f458 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now
 2014-09-08 19:31:58 +00:00
Adam Harvey
0cbfdc9df5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now

Conflicts:
	configure.in
	main/php_version.h
 2014-09-08 19:28:15 +00:00
Adam Harvey
bc44eb6172 Fix bug #67972 (SessionHandler Invalid memory read create_sid()). 
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
 2014-09-08 19:25:14 +00:00
Anatol Belski
5661a1ba0b fix null pointer deref 2014-09-07 20:26:01 +02:00
Anatol Belski
e254ba32d5 fixed the tests, related to the basename behaviour, bug #66395 2014-09-07 20:11:49 +02:00
Nikita Popov
f4f9b54983 Revert "Move safe_address into zend_multiply.h" 
This reverts commit 43b02e169c.

I'm getting symbol resolution issues for zend_error_noreturn in the
opcache.so, so reverting this for now.
 2014-09-06 22:12:37 +02:00
Nikita Popov
43b02e169c Move safe_address into zend_multiply.h 
This allows reuse in zend_arena_calloc.

Also renamed the function to zend_safe_address as it's no longer
private to the allocator.
 2014-09-06 14:03:59 +02:00
Nikita Popov
9ab8605f8b Release memory for PDO Stmt ctor args 2014-09-06 12:52:51 +02:00
Nikita Popov
17cb2443a7 Fix ext/xml warnings 2014-09-06 12:26:41 +02:00
Nikita Popov
e06f5f0df8 Drop some unsafe-looking casting code from ext/socket 
ZVAL_COPY before convert_to_string is probably not right.
 2014-09-05 11:35:41 +02:00
Nikita Popov
c48a126ba4 Fix readline warnings 2014-09-05 11:20:06 +02:00
Nikita Popov
c720677162 Fix SOAP warnings 2014-09-05 11:20:06 +02:00
Xinchen Hui
8002e2c06a Fixed discards qualifiers from pointer target type 2014-09-05 09:31:05 +08:00
Xinchen Hui
59f10e4ca0 Merge branch 'master' of https://git.php.net/repository/php-src 2014-09-05 09:22:23 +08:00
Nikita Popov
e015bb0381 Fix invalid zend_string free in soap 
By making get_http_headers() return the zend_string* directly.
 2014-09-04 22:29:30 +02:00
Nikita Popov
0c5ac39796 Fix smart_str_append() 
Would segfault if src->s == NULL.
 2014-09-04 21:55:27 +02:00
Nikita Popov
00805ffb92 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/php_http.c
 2014-09-04 21:23:11 +02:00
Nikita Popov
03797a73b2 Split GMP tests testing multiple functions 
Also drop dummy test
 2014-09-04 21:18:37 +02:00
Nikita Popov
9586b15229 Give proper names to GMP test files 2014-09-04 21:10:41 +02:00
Nikita Popov
15c139b99a Throw warnings when using zero modulus in gmp_powm 
Also fixes a leak in this case.
 2014-09-04 20:55:09 +02:00
Tjerk Meesters
6f6541dc84 Merge branch 'pr/804' 
* pr/804:
  Adds phpversion test to prevent #67959
 2014-09-05 02:17:42 +08:00
Florian MARGAINE
e338e26ab7 Adds phpversion test to prevent #67959 2014-09-04 20:13:43 +02:00
Nikita Popov
f10d194c8c Add GMP tests for some uncovered branches 2014-09-04 20:03:29 +02:00
Tjerk Meesters
6951f8adb0 Merge branch 'pr/803' 
* pr/803:
  Fixes zpp parameter from int to size_t
 2014-09-05 02:02:20 +08:00
Florian MARGAINE
c24c7ff224 Fixes zpp parameter from int to size_t 2014-09-04 19:59:39 +02:00
Xinchen Hui
bb92801338 it's should be zend_ulong 2014-09-04 16:26:53 +08:00
Xinchen Hui
39c3207896 Revert previous commit by mistake 2014-09-04 11:59:58 +08:00
Xinchen Hui
e90ec235dc Use PHP_GINIT to suppress incompatible pointer type 2014-09-04 11:56:13 +08:00
Tjerk Meesters
fa08ff9245 Fixed #67955: SoapClient prepends 0-byte to cookie names 2014-09-04 06:58:04 +08:00
Nikita Popov
d85ab21ac4 Fix DOM warnings 2014-09-03 21:35:53 +02:00
Nikita Popov
2b133e9149 Separate php_mb_reset() from php_mblen() 
Instead of fighting against warnings ...
 2014-09-03 20:37:04 +02:00
Nikita Popov
dd38c9e101 Fix ftp_login() 2014-09-03 16:52:56 +02:00
Dmitry Stogov
5c897aa7da Preallocate hash tables of required size 2014-09-03 18:21:36 +04:00
Nikita Popov
6cceb54c09 Fix a number of format issues 2014-09-03 15:57:28 +02:00
Philip Hofstetter
9befa8c5f7 fix bug #67955 
this fixes a regression from 6c2a806820.

smart_str_appendl is expecting the length as the length of the string,
but key_length is the byte length of the key, including the 0
terminator.

As such, the cookie name appeneded to the header would now also include
the 0 terminator of the key name which then would be sent to the server.
 2014-09-03 14:35:40 +02:00
Matteo Beccati
d1b0066df7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:45:17 +02:00
Matteo Beccati
627704b38e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027 Fixed test with freetype >= 2.4.12 2014-09-03 09:43:29 +02:00
Nikita Popov
2d364747ca Merge branch 'PHP-5.6' 
Conflicts:
	ext/gmp/gmp.c
 2014-09-02 19:07:54 +02:00
Nikita Popov
834daa455b Fixed bug #50175 
0x and 0b prefix is now only handled if either no base is given
or if the base is 16 (0x) or 2 (0b). Always handling it is incorrect
because 0x and 0b are perfectly valid numbers in other bases.
 2014-09-02 19:04:55 +02:00
Nikita Popov
7533243f0c Fix C89 build and small cleanup 2014-09-02 18:52:13 +02:00
Nikita Popov
5138f3ba22 Skip 64bit test on 32bit 
Also minor type improvements
 2014-09-02 18:42:39 +02:00
Anatol Belski
08b732f26b fix datatypes for gmp to be compatible with GMP/MPIR on different platforms 2014-09-02 18:19:51 +02:00
Anatol Belski
e7386aa1fd add a test with gmp and PHP_INT_MAX 2014-09-02 18:16:19 +02:00
Anatol Belski
20e15f55e8 one semicolon too much 2014-09-02 16:40:41 +02:00
Anatol Belski
fee39d0868 fix type 2014-09-02 15:56:13 +02:00
Nikita Popov
e3da88b898 mpz functions don't work on zend_ulongs... 
If we really want to support zend_ulong > ulong in GMP the right
approach would be to only handle < LONG_MAX in ui shortcut functions
and use mpz_import in convert_to_gmp for number > LONG_MAX.
 2014-09-02 14:37:15 +02:00
Nikita Popov
8e7cd7a0f9 Merge branch 'PHP-5.6' 
Conflicts:
	ext/gmp/gmp.c
 2014-09-02 14:28:07 +02:00
Leigh
47d630e7f0 Implement gmp_import() and gmp_export() 2014-09-02 14:19:18 +02:00
Dmitry Stogov
e51677b2e6 fixed reference counting 2014-09-02 11:24:52 +04:00
Dmitry Stogov
1670772dc6 Avoid string duplication 2014-09-02 09:52:23 +04:00
Tjerk Meesters
297a9b1f75 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Make DOMNode::textContent writeable
  Updated UPGRADING
  Updated NEWS

Conflicts:
	ext/dom/attr.c
	ext/dom/characterdata.c
	ext/dom/document.c
	ext/dom/node.c
 2014-09-02 06:54:52 +08:00
Tjerk Meesters
f54451cf39 Make DOMNode::textContent writeable 2014-09-02 06:34:18 +08:00
Anatol Belski
481bf25b6a restore the length var and fix the com_dotnet ini 2014-09-01 20:34:33 +02:00
Dmitry Stogov
88d7ca44f6 Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
Derick Rethans
b9f3247267 Merge branch 'PHP-5.6' 2014-09-01 16:40:57 +01:00
Derick Rethans
f89b7ec389 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9 - Updated to version 2014.7 (2014g) 2014-09-01 16:40:49 +01:00
Tjerk Meesters
5d5a7b1f7f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated UPGRADING for #38409
  Updated NEWS for #38409
  Added test case
  Making ini parser typed - Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file() - Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE - Added zend_ini_copy_typed_value() function for zval initialisation - Updated RETURN_TOKEN() to observe scanner_mode

Conflicts:
	Zend/zend_ini_parser.y
	Zend/zend_ini_scanner.c
 2014-09-01 22:43:17 +08:00
Tjerk Meesters
1bf996b324 Added test case 2014-09-01 22:04:25 +08:00
Tjerk Meesters
5270ee1aef Making ini parser typed 
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
 2014-09-01 22:04:06 +08:00
Anatol Belski
f4ed876db1 fix acosh for vs2012 and earlier 2014-09-01 15:34:42 +02:00
Anatol Belski
3aa5583cab fix asinh() on win64 for big negative values 2014-09-01 15:34:40 +02:00
Anatol Belski
a3f82ae0ee fix expected warning in test 2014-08-31 14:02:31 +02:00
Anatol Belski
b89d7ae5ba fix dir separators in test 2014-08-31 14:02:30 +02:00
Anatol Belski
312181bc13 fix iptcembed() 2014-08-31 14:02:28 +02:00
Anatol Belski
f4ebeead5d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67731 finfo::file() returns invalid mime type for binary files
 2014-08-30 04:05:42 +02:00
Anatol Belski
c301467f9b Fixed bug #67731 finfo::file() returns invalid mime type for binary files 2014-08-30 04:04:42 +02:00
Johannes Schlüter
ca042bb18c Use global symbol table for completion after $ in readline. 2014-08-30 00:02:31 +02:00
Nikita Popov
f1c2017851 Don't depend on exact parse error messages in assert tests 2014-08-29 22:07:25 +02:00
Christopher Jones
e39cc57bbd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove 550+ compile warnings on OS X
 2014-08-29 08:48:56 -07:00
Christopher Jones
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
Christopher Jones
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
Anatol Belski
a9c5dab1d0 revert the lstat part 2014-08-29 17:21:02 +02:00
Anatol Belski
f9b051241a fix stat vs zend_stat 2014-08-29 13:43:40 +02:00
Anatol Belski
13ccda7249 fix implicit st_rdev element handling when negative value was passed 2014-08-29 13:30:53 +02:00
Anatol Belski
451856420c data type fixes 2014-08-29 12:53:37 +02:00
Anatol Belski
e206409a8c exclude log2 usage which requires C99 support 2014-08-29 10:55:55 +02:00
Anatol Belski
c14b3d5d82 fixed path in test 2014-08-29 08:41:29 +02:00
Xinchen Hui
b2d2b965b2 resource type is int 2014-08-29 11:28:21 +08:00
Andrea Faulds
389d285973 Special-case aliases, add warning comments to implementations 2014-08-29 00:10:52 +02:00
Anatol Belski
5fc0006d35 skip this if we can't check the uid 2014-08-28 22:22:38 +02:00
Anatol Belski
898e1570a2 fixed trim() and strtok() to work with big strings 2014-08-28 21:59:00 +02:00
Anatol Belski
8e05b9104b fixed strip_tags() and hebrev() to work with big strings 2014-08-28 19:35:37 +02:00
Dmitry Stogov
c8ff3421a0 Duplicate array only if neccessary 2014-08-28 20:51:22 +04:00
Anatol Belski
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
Anatol Belski
f4e04b9fb1 fix phar copy-on-write 2014-08-28 17:35:54 +02:00
Popa Adrian Marius
e41754b7d8 rename misleading define 2014-08-28 18:20:28 +03:00
Anatol Belski
9f1b68eda5 fix incompatible pointer 2014-08-28 17:03:41 +02:00
Popa Adrian Marius
59286f89f7 solve conflicting type size_t vs int 2014-08-28 17:10:42 +03:00
Dmitry Stogov
3447d465af Use better hash functions 2014-08-28 17:47:40 +04:00
Dmitry Stogov
234af84c04 Refactored optimizer (compile different opimizer passes separately, instead of including *.c file) 2014-08-28 17:23:12 +04:00
Anatol Belski
a502639412 remove the expression parts, which are always true 2014-08-28 11:38:23 +02:00
Anatol Belski
e831de3024 fix some types and unnecessary casts 2014-08-28 11:38:22 +02:00
Anatol Belski
0b04843573 fix type 2014-08-28 11:38:21 +02:00
Anatol Belski
d2e416a90b fix pg_last_notice() 2014-08-28 10:45:47 +02:00
Tjerk Meesters
aa161f0723 Changed 'unsigned size_t' to 'size_t' 2014-08-28 16:39:35 +08:00
Xinchen Hui
bc3d9b3ba2 Fixed segfaults after change size_t of "s" 2014-08-28 15:43:14 +08:00
Xinchen Hui
697472e3e1 Merge branch 'master' of https://git.php.net/repository/php-src 2014-08-28 14:56:53 +08:00
Xinchen Hui
de4282fa3e Revert "Fixed incompatible pointer type" 
This reverts commit 007406c775.
 2014-08-28 14:56:25 +08:00
Anatol Belski
a4532f6d4d fix hash_pbkdf2() 2014-08-28 08:55:05 +02:00
Dmitry Stogov
a038ab892f Fixed type 2014-08-28 10:31:13 +04:00
Xinchen Hui
88fdb5f084 Fixed iconv MINFO 2014-08-28 13:11:07 +08:00
Xinchen Hui
007406c775 Fixed incompatible pointer type 2014-08-28 11:34:00 +08:00
Dmitry Stogov
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
Anatol Belski
ca0069bc33 fix remaining 's' args for pgsql 2014-08-28 00:21:12 +02:00
Johannes Schlüter
dadbbf8945 Fix compilation on systems without ecdh_curve 2014-08-28 00:12:48 +02:00
Anatol Belski
7d6c3e01c9 fix remaining 's' args for openssl 2014-08-28 00:05:29 +02:00
Anatol Belski
734e11cca7 fixed remaining 's' args for ftp 2014-08-27 23:56:19 +02:00
Anatol Belski
cf430b9a6f fix linkinfo() 2014-08-27 23:44:28 +02:00
Anatol Belski
e6dcd19aed restore the old part of ezmlm_hash() 2014-08-27 23:14:54 +02:00
Anatol Belski
0e41927ca0 fixed UConverter::convert() 2014-08-27 23:03:58 +02:00
Anatol Belski
a1a4a6101c fix typo 2014-08-27 22:47:13 +02:00
Anatol Belski
2ee3ec999b fixed php_wddx_packet_start signature 2014-08-27 22:45:19 +02:00
Nikita Popov
f099c3f2ec Merge branch 'PHP-5.6' 2014-08-27 22:18:55 +02:00
Anatol Belski
60373b2ac2 fix signature 2014-08-27 22:17:16 +02:00
Nikita Popov
fc5f931663 Fix bug #67917 (gmp compound assignment operator leak) 2014-08-27 22:16:20 +02:00
Anatol Belski
232459efd0 fix signature 2014-08-27 22:13:01 +02:00
Anatol Belski
074c68e9ce fix signature 2014-08-27 22:05:26 +02:00
Anatol Belski
039f512289 fix signature 2014-08-27 22:01:43 +02:00
Anatol Belski
1e3e9e0bbb 's' and size_t - fix some invalid pointers and the remaining ext/mcrypt parts 2014-08-27 21:53:06 +02:00
Anatol Belski
bf96ee95ce 's' works with size_t round 4 2014-08-27 20:49:37 +02:00
Anatol Belski
6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
5882446b8b revert an accident 2014-08-27 20:49:32 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Dmitry Stogov
ee552b628c Reorder fields for better nenory consumtion and data locality on 64-bit systems 2014-08-27 22:45:27 +04:00
Chris Wright
0a1df74895 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:35:28 +01:00
Chris Wright
db03216e62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa Fix stream_select() issue with OpenSSL buffer 
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 13:25:50 +01:00
Anatol Belski
a831bd40d0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed DBG_INF macro name
  reworked NEWS for 5.6.0GA
 2014-08-27 12:11:59 +02:00
Anatol Belski
4d667eeaf3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed DBG_INF macro name
 2014-08-27 12:11:35 +02:00
Anatol Belski
7fac56e072 fixed DBG_INF macro name 2014-08-27 12:10:35 +02:00
Dmitry Stogov
37f9f10f01 Improved performance of json_encode() 2014-08-27 13:37:54 +04:00
Nikita Popov
f719b9ddcf Fix mbstring overloads in zts 2014-08-27 01:26:57 +02:00
Nikita Popov
694824f302 Fix test with opcache/zts dependent output 
Refcount depends on whether array is immutablized and string is
interned.
 2014-08-27 00:31:20 +02:00
Nikita Popov
95fac3cee3 Fix session handlers in zts 
Also use ZEND_HASH_FOREACH API.
 2014-08-27 00:26:21 +02:00
Dmitry Stogov
614bc31635 Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion 2014-08-27 01:39:39 +04:00
Nikita Popov
e7f252652f Fix tokenizer test to not depend on specific token numbers 2014-08-26 23:36:53 +02:00
Dmitry Stogov
9a05f2dad2 Fixed uint32_t overflow 2014-08-26 15:57:19 +04:00
Anatol Belski
b63ab83256 several signature and data type fixes 2014-08-26 13:20:21 +02:00
Dmitry Stogov
d17790b35e Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fixed several long vs zend_long casts
 2014-08-26 14:23:01 +04:00
Dmitry Stogov
055b632e7d Fixed return operand type (Use IS_TMP_VAR instead of IS_VAR in the same way as it was before AST patch) 2014-08-26 14:22:03 +04:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Anatol Belski
c2cb2cb9f8 regenerated date parsers 2014-08-26 10:40:47 +02:00
Anatol Belski
3b75f96569 fix typo 2014-08-26 10:06:43 +02:00
Julien Pauli
0686b4448d implement #67886 2014-08-26 10:02:55 +02:00
Anatol Belski
c49cd84da9 make timelib independent from zend_long 2014-08-26 09:27:55 +02:00
Xinchen Hui
6469339a58 Fixed incompatible pointer 2014-08-26 12:19:09 +08:00
Xinchen Hui
dc6cd48efb Fixed incompatible pointer 2014-08-26 12:19:06 +08:00
Xinchen Hui
80dd764612 Fixed incompatible pointer 2014-08-26 12:12:39 +08:00
Xinchen Hui
a3fd5b6954 Unused variable 2014-08-26 11:50:42 +08:00
Xinchen Hui
0a712e1913 Unused variable 2014-08-26 11:49:32 +08:00
Xinchen Hui
c56c4d246c Unused variale 2014-08-26 11:48:59 +08:00
Anatol Belski
993ae7e9f6 fix strtol call 2014-08-26 00:25:29 +02:00
Anatol Belski
c6a35115bc fix func argument type 2014-08-25 23:52:40 +02:00
Nikita Popov
59848e3fbb Remove ZEND_ACC_INTERACTIVE and CG(interactive) 
As far as I can discern these are leftovers of the interactive
shell implementation that was used before PHP 5.4. Now the readline
ext makes use of normal eval calls for this.

So, dropping these until there is evidence to the contrary, as they
currently wouldn't work anyway.
 2014-08-25 23:46:43 +02:00
Nikita Popov
28e7beea66 Fix zend_longo_str 2014-08-25 22:47:04 +02:00
Nikita Popov
899a1ed59a Merge branch 'ast' 
Conflicts:
	Zend/zend_compile.c
 2014-08-25 22:04:33 +02:00
Nikita Popov
6db293d5e0 Merge remote-tracking branch 'php-src/master' into ast 
Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_globals.h
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_types.h
 2014-08-25 21:52:18 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
b9514bb8fd master renames phase 6 2014-08-25 21:26:42 +02:00
Anatol Belski
28b7a03318 master renamings phase 5 2014-08-25 21:20:44 +02:00
Anatol Belski
455741fce3 master renames phase 4 2014-08-25 20:57:25 +02:00
Anatol Belski
5410282258 Merge branch 'master' of git.php.net:php-src 
# By Daniel Lowrey
# Via Daniel Lowrey
* 'master' of git.php.net:php-src:
  Update NEWS
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
 2014-08-25 20:23:14 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Daniel Lowrey
cc487e6cdf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
 2014-08-25 19:35:01 +02:00
Anatol Belski
6f9f0bf205 master renames phase 2 2014-08-25 19:28:33 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Daniel Lowrey
546a32e2b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c Bug #67850: Build when OpenSSL compiled without SSLv3 support 2014-08-25 17:28:09 +02:00
Lior Kaplan
0cf2dbdf58 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:31:10 +03:00
Lior Kaplan
6e87b01e95 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946 Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk> 2014-08-25 00:29:05 +03:00
Anatol Belski
80a3b9ca40 bring back the logic to parse 64 bit props also in 32 bit build 2014-08-24 11:48:57 +02:00
Anatol Belski
9ac656cc20 Merge branch 'master' of git.php.net:php-src 
# By Ferenc Kovacs
# Via Ferenc Kovacs
* 'master' of git.php.net:php-src:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 02:55:01 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Ferenc Kovacs
50b20e75ff Merge branch 'PHP-5.6' 
* PHP-5.6:
  this test depends on the simplexml ext, not just on xml

Conflicts:
	ext/simplexml/tests/bug62328.phpt
 2014-08-24 00:18:51 +02:00
Ferenc Kovacs
86966a092b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:31 +02:00
Ferenc Kovacs
a90d05a430 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:00 +02:00
Ferenc Kovacs
cb41a7bad1 this test depends on the simplexml ext, not just on xml 2014-08-24 00:08:09 +02:00
Tjerk Meesters
86674b5837 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #67694: Regression in session_regenerate_id()

Conflicts:
	ext/session/session.c
 2014-08-23 09:21:36 +08:00
Tjerk Meesters
ce9bdae33f Fixed #67694: Regression in session_regenerate_id() 2014-08-23 09:18:02 +08:00
Anatol Belski
79f888a602 Merge remote-tracking branch 'weltling/master' 
* weltling/master: (725 commits)
  fix zpp
  fixed array_pad()
  fix zpp
  fix zpp
  fix zpp
  fix zpp and a bit more
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fixed the test
  ...
 2014-08-22 08:58:03 +02:00
Xinchen Hui
da35db3ec5 Fixed complier error 2014-08-22 10:20:44 +08:00
Michael Wallner
7fca659a7b Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
 2014-08-21 22:46:03 +02:00
Michael Wallner
3b82c4e520 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
 2014-08-21 22:45:33 +02:00