clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,760 Commits 491 Branches 1,363 Tags 846 MiB
ed55d52fa7
Commit Graph

4181 Commits

Author SHA1 Message Date
Kalle Sommer Nielsen
ed55d52fa7 optimize path length retrieval 2014-09-15 10:43:38 +02:00
Anatol Belski
6a92d32105 fix type 2014-09-14 14:43:39 +02:00
Anatol Belski
d6bf1117a6 avoid multiple strlen() usage 2014-09-13 23:21:42 +02:00
Anatol Belski
586b863ba7 avoid multiple strlen() calls for the same 2014-09-13 23:21:40 +02:00
Anatol Belski
bea0face48 reduce the struct size by 8 bytes on 64 bit 2014-09-12 23:10:56 +02:00
Anatol Belski
67beaebaa8 reduce the struct size by 8 byte on x64 2014-09-12 23:08:09 +02:00
Anatol Belski
9adf0c8e07 better alignment, reduced the struct by 8 byte on 64 bit 2014-09-12 21:35:18 +02:00
Anatol Belski
10f856386d fix type 2014-09-12 21:35:17 +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
Julien Pauli
8ff79d3e89 5.6.2 now 2014-09-11 18:37:25 +02:00
Michael Wallner
a6c47caf25 Merge branch 'PHP-5.6' 
* PHP-5.6:
  duplicate value's string for the SAPI filter
  Fine tuned the order of adding request variables.
 2014-09-09 06:56:33 +02:00
Michael Wallner
8d1099ac05 duplicate value's string for the SAPI filter 
reported by sesser; tyrael, do you take care of the bug/NEWS?
 2014-09-09 06:54:23 +02:00
Nikita Popov
6cceb54c09 Fix a number of format issues 2014-09-03 15:57:28 +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
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
Stanislav Malyshev
af85eff5b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback
 2014-09-02 12:32:03 -07:00
Stanislav Malyshev
53fa6c5b6b Fix bug #67644 - Memory corruption & crash during ob_start function callback 2014-09-02 12:31:03 -07:00
Dmitry Stogov
e321170c18 Fixed memory leaks 2014-09-02 14:11:22 +04: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
Nuno Lopes
25f5ba94ac remove a few gcc format attributes from some printf-like functions 
Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it
 2014-08-31 11:45:11 -04:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02: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
Ferenc Kovacs
7ec03b481a almost forgot to bump this 2014-08-27 04:18:23 +02:00
Ferenc Kovacs
b165be9ae1 from now on, this should be 5.6.1-dev 2014-08-27 04:14:23 +02:00
Anatol Belski
b63ab83256 several signature and data type fixes 2014-08-26 13:20:21 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Xinchen Hui
df7b6779bc Fixed incompatible pointer type (int64) 2014-08-26 12:11:28 +08:00
Anatol Belski
c429c74be9 generalize the zend_long stuff 2014-08-25 23:52:39 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +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
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +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
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
8e8a30654e fix zpp 2014-08-20 17:56:07 +02:00
Anatol Belski
745a71be33 yet more fixes to zpp 2014-08-20 14:46:14 +02:00
Anatol Belski
398a1cc655 added php_off_t alias 2014-08-19 14:39:24 +02:00
Anatol Belski
40912abf1d Merge remote-tracking branch 'php/master' 
Conflicts:
	ext/xsl/xsltprocessor.c
 2014-08-19 12:56:29 +02:00
Stanislav Malyshev
ff6b30c818 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:38 -07:00
Stanislav Malyshev
fae17a00f5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:25 -07:00