php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 13:43:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,677 Commits 547 Branches 1,481 Tags
12c2a8a5eb97049ec0f68369dfe8516ffde87bf3
Commit Graph

75677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
12c2a8a5eb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix for php bug #64802 includes test case
 2013-08-18 16:55:03 -07:00
Stanislav Malyshev
bd29ff7c38 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c
 2013-08-18 15:45:17 -07:00
Mark Jones
9973658a44 Fix for php bug #64802 includes test case 2013-08-18 15:42:37 -07:00
Stanislav Malyshev
42214b6474 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
 2013-08-18 15:19:27 -07:00
Marcel Araujo
265224778b Use in preg_replace_callback() using variables by reference and test for bug #64979 2013-08-18 15:18:30 -07:00
Marcel Araujo
47678c06c6 https://bugs.php.net/bug.php?id=64979 2013-08-18 15:09:43 -07:00
Stanislav Malyshev
33e9c02451 Merge branch 'PHP-5.5' 
* PHP-5.5:
  add CVE-2011-4718
 2013-08-18 14:42:59 -07:00
Stanislav Malyshev
b33a1a1397 add CVE-2011-4718 2013-08-18 14:42:06 -07:00
Stanislav Malyshev
4bc6e06037 Merge branch 'PHP-5.5' 
* PHP-5.5:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:21:24 -07:00
Stanislav Malyshev
bf0c6f2858 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:21:14 -07:00
Stanislav Malyshev
4fbce676bd Merge branch 'pull-request/381' 
* pull-request/381:
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:20:46 -07:00
Stanislav Malyshev
0154db1c5f new for fix #65225 2013-08-18 14:20:17 -07:00
Patrick Allaert
98d29d20a1 Fixed #65225: PHP_BINARY incorrectly set 2013-08-18 14:18:33 -07:00
Stanislav Malyshev
756ce65b92 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use pkg-config to detect iodbc
 2013-08-18 14:16:34 -07:00
Stanislav Malyshev
1794291ebe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use pkg-config to detect iodbc
 2013-08-18 14:16:24 -07:00
Ole Markus With
a3fa25e857 Use pkg-config to detect iodbc 2013-08-18 14:16:17 -07:00
Stanislav Malyshev
8845262995 Merge branch 'pull-request/411' 
* pull-request/411:
  Use pkg-config to detect iodbc
 2013-08-18 14:15:53 -07:00
Stanislav Malyshev
958ee39fc7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
 2013-08-18 14:11:15 -07:00
Stanislav Malyshev
2ee7e122a7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
 2013-08-18 14:09:19 -07:00
Stanislav Malyshev
f4da131328 Merge branch 'pull-request/412' 
* pull-request/412:
  Create test to the extension xmlrpc
 2013-08-18 14:08:57 -07:00
Stanislav Malyshev
3da2fb335d Add -P option to use the current binary 2013-08-18 14:08:03 -07:00
root
ac2d2b9b72 Create test to the extension xmlrpc 2013-08-18 13:59:39 -07:00
Stanislav Malyshev
5786e779fb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixbug: phpize --clean will delete include/*.h
 2013-08-18 13:52:49 -07:00
Stanislav Malyshev
296a434d52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixbug: phpize --clean will delete include/*.h
 2013-08-18 13:52:38 -07:00
Tianfeng
4a0e87e497 Fixbug: phpize --clean will delete include/*.h 2013-08-18 13:52:20 -07:00
Stanislav Malyshev
625152591b Merge branch 'pull-request/405' 
* pull-request/405:
  Fixbug: phpize --clean will delete include/*.h
 2013-08-18 13:50:33 -07:00
Stanislav Malyshev
03b2603ce0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  code related typo fixes
  Fix duplicated 5.5.2 NEWS in my tree
 2013-08-18 13:47:00 -07:00
Veres Lajos
144eab0889 code related typo fixes 2013-08-18 13:46:32 -07:00
root
acda3dab6c Create test to the extension xmlrpc 2013-08-18 18:44:52 +00:00
Yasuo Ohgaki
e960eebfea Revise pgsql tests 2013-08-18 18:24:34 +09:00
Ole Markus With
7e7a8f00c4 Use pkg-config to detect iodbc 2013-08-17 14:22:11 +02:00
Christopher Jones
803045e3c7 Fix duplicated 5.5.2 NEWS in my tree 2013-08-16 12:03:01 -07:00
Christopher Jones
0c4ba514be Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  fix typo
  merge news for 5.5.2
 2013-08-16 11:39:37 -07:00
Christopher Jones
a6f596f90f Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix typo
  merge news for 5.5.2
 2013-08-16 11:39:07 -07:00
Stanislav Malyshev
a42e87dadb Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix typo
 2013-08-16 11:34:27 -07:00
Stanislav Malyshev
466584f40b fix typo 2013-08-16 11:34:16 -07:00
Stanislav Malyshev
94cd406b1e Merge branch 'PHP-5.5' 
* PHP-5.5:
  merge news for 5.5.2
 2013-08-16 11:31:39 -07:00
Stanislav Malyshev
4734b31953 merge news for 5.5.2 2013-08-16 11:30:54 -07:00
Christopher Jones
c04d1406e9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Update NEWS
  Update NEWS
 2013-08-16 11:16:27 -07:00
Christopher Jones
60c8d814e7 Update NEWS 2013-08-16 11:16:06 -07:00
Christopher Jones
7237c317d6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2013-08-16 11:13:55 -07:00
Christopher Jones
cb539b3e96 Update NEWS 2013-08-16 11:13:27 -07:00
Christopher Jones
8807726be3 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  fix cve number
 2013-08-16 11:10:10 -07:00
Christopher Jones
1eadd15607 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix cve number
 2013-08-16 11:10:04 -07:00
Christopher Jones
6993ca5bd7 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix cve number
 2013-08-16 11:07:25 -07:00
Christopher Jones
2251e4369a Merge branch 'PHP-5.5' 
* PHP-5.5:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/
 2013-08-16 10:57:55 -07:00
Christopher Jones
4b4ffaf703 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/
 2013-08-16 10:49:05 -07:00
Christopher Jones
0ebef462ce With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and 
Linux are now used.  DTrace is part of Oracle Linux.  See
https://oss.oracle.com/projects/DTrace/

This patch does not change DTrace linking for non-Solaris/Linux
platforms.

For SystemTap users on Linux, this patch removes the compilation
warning:
  Warning: Linking the shared library libphp5.la against the
  non-libtool objects Zend/zend_dtrace.d.o is not portable!
 2013-08-16 10:40:50 -07:00
Stanislav Malyshev
991f0113bf Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix cve number
 2013-08-16 10:39:15 -07:00
Stanislav Malyshev
5788797964 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix cve number
 2013-08-16 10:23:31 -07:00