Commit Graph

84577 Commits

Author SHA1 Message Date
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
Tjerk Meesters
70d4b80c44 Updated NEWS for #67959 2014-09-05 02:05:06 +08: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
Dmitry Stogov
92164f6b7b Fixed compilation warnings 2014-09-04 14:06:22 +04: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
af3bd57d33 Updated NEWS for #67955 2014-09-04 07:00:14 +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
George Wang
b85b78db4f Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
2014-09-03 11:29:44 -04:00
Nikita Popov
dd38c9e101 Fix ftp_login() 2014-09-03 16:52:56 +02:00
Nikita Popov
964e1174b4 Fix Z_UL 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
Nikita Popov
979058d4ff Disable format string checking by default
Instead of removing format attributes altogether, disable the checks
by default. This allows you to do a build with format string checks
and filter out the false positives (basically anything mentioning
%p).
2014-09-03 15:38:06 +02:00
Nikita Popov
fdd1e96f3e Revert "remove a few gcc format attributes from some printf-like functions"
This reverts commit 25f5ba94ac.
2014-09-03 15:22:08 +02:00
Nikita Popov
9e75353184 Use zval_ptr_dtor_nogc to destroy literals
Also move the definition of zval_ptr_dtor_nogc to zend_variables.h
(from zend_execute.h/.c) as it's used in a few places.
2014-09-03 15:18:06 +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
Dmitry Stogov
c52511c307 Disabled usage of built-in functions in write context (e.g. strlen($s)[] = ...) 2014-09-03 16:30:48 +04:00
Dmitry Stogov
9a958a086d Simplify BEGIN_SILENCE/END_SILENCE to not modify ini entry value back and force 2014-09-03 15:17:50 +04: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
Dmitry Stogov
b0f0211b1a Revert "Fixed memory leaks"
This reverts commit 0940e54ffc.
2014-09-03 02:38:04 +04:00
Dmitry Stogov
0940e54ffc Fixed memory leaks 2014-09-03 02:07:38 +04:00
Stanislav Malyshev
6036d47e6a Merge branch 'PHP-5.6'
* PHP-5.6:
  5.4.34 is next
2014-09-02 15:04:08 -07:00
Stanislav Malyshev
3e7d11b632 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.34 is next
2014-09-02 15:04:00 -07:00
Stanislav Malyshev
a734acd439 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.4.34 is next

Conflicts:
	configure.in
	main/php_version.h
2014-09-02 15:03:54 -07:00
Stanislav Malyshev
5e95b61639 5.4.34 is next 2014-09-02 15:03:04 -07:00
Stanislav Malyshev
91505203c0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:19:16 -07:00
Stanislav Malyshev
0c6e2b5219 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:19:03 -07:00
Stanislav Malyshev
70f92aa97e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:18:05 -07:00
Stanislav Malyshev
fe551c089a Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
This reverts commit 53fa6c5b6b.
The change breaks tests, so not putting it into 5.4.
2014-09-02 14:15:39 -07:00
Stanislav Malyshev
ce776aea57 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:33:02 -07:00
Stanislav Malyshev
63f42adbb2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:40 -07:00