.idea/workspace.xml

@@ -1,40 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="dfd12a5c-7c33-415d-9f50-070ce9f4f8ce" name="Default" comment="代码结束">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/webResources.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/awj/awj/utils/et_CACC_NO.py" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/awj/awj/utils/if_account.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/admin.py" afterPath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/admin.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/apps.py" afterPath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/apps.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/models.py" afterPath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/models.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/tests.py" afterPath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/tests.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/urls.py" afterPath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/urls.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/views.py" afterPath="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/admin.py" afterPath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/admin.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/apps.py" afterPath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/apps.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/models.py" afterPath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/models.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/tests.py" afterPath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/tests.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/urls.py" afterPath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/urls.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/views.py" afterPath="$PROJECT_DIR$/awj/awj/apps/salesinvoice/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/admin.py" afterPath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/admin.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/apps.py" afterPath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/apps.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/models.py" afterPath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/models.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/tests.py" afterPath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/tests.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/urls.py" afterPath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/urls.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py" afterPath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/xixi.py" afterPath="$PROJECT_DIR$/awj/awj/apps/stockinvoice/xixi.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/setting/dev.py" afterPath="$PROJECT_DIR$/awj/awj/setting/dev.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/setting/lianxi.py" afterPath="$PROJECT_DIR$/awj/awj/setting/lianxi.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/urls.py" afterPath="$PROJECT_DIR$/awj/awj/urls.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/utils/cust_data.py" afterPath="$PROJECT_DIR$/awj/awj/utils/cust_data.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/utils/examine_ood.py" afterPath="$PROJECT_DIR$/awj/awj/utils/examine_ood.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/utils/invoice_dh.py" afterPath="$PROJECT_DIR$/awj/awj/utils/invoice_dh.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/utils/middleware.py" afterPath="$PROJECT_DIR$/awj/awj/utils/middleware.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/utils/usr_data.py" afterPath="$PROJECT_DIR$/awj/awj/utils/usr_data.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/wsgi.py" afterPath="$PROJECT_DIR$/awj/awj/wsgi.py" />
+    <list default="true" id="dfd12a5c-7c33-415d-9f50-070ce9f4f8ce" name="Default" comment="接口测试">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Apache24/logs/error.log" afterPath="$PROJECT_DIR$/Apache24/logs/error.log" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/awj/apps/erp/views.py" afterPath="$PROJECT_DIR$/awj/awj/apps/erp/views.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/logs/hwj.log" afterPath="$PROJECT_DIR$/awj/logs/hwj.log" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/awj/manage.py" afterPath="$PROJECT_DIR$/awj/manage.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -48,79 +19,138 @@
     <SUITE FILE_PATH="coverage/wanjia$lianxi.coverage" NAME="lianxi Coverage Results" MODIFIED="1571323191887" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj/awj/setting" />
     <SUITE FILE_PATH="coverage/wanjia$xixi__1_.coverage" NAME="xixi (1) Coverage Results" MODIFIED="1572786070217" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj/awj/apps/stockinvoice" />
     <SUITE FILE_PATH="coverage/wanjia$a.coverage" NAME="a Coverage Results" MODIFIED="1571234756857" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/wanjia$manage.coverage" NAME="manage Coverage Results" MODIFIED="1573644329658" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj" />
+    <SUITE FILE_PATH="coverage/wanjia$views___.coverage" NAME="views - 副本 Coverage Results" MODIFIED="1576724322091" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj/awj/apps/erp" />
+    <SUITE FILE_PATH="coverage/wanjia$manage.coverage" NAME="manage Coverage Results" MODIFIED="1577352028102" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj" />
     <SUITE FILE_PATH="coverage/wanjia$xixi.coverage" NAME="xixi Coverage Results" MODIFIED="1571566034339" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/awj/awj/apps" />
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-378">
-              <caret line="18" column="27" lean-forward="false" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="27" />
-              <folding>
-                <element signature="e#10081#19332#0" expanded="false" />
-                <element signature="e#19398#23319#0" expanded="false" />
-                <marker date="1573644329326" expanded="true" signature="4690:4900" ph="INSERT INTO MF_PSS... " />
-                <marker date="1573644329326" expanded="true" signature="5164:5337" ph="INSERT INTO TF_PSS... " />
-                <marker date="1573644329326" expanded="true" signature="5487:5732" ph="INSERT INTO INV_NO... " />
-                <marker date="1573644329326" expanded="true" signature="6014:6213" ph="INSERT INTO MF_ARP... " />
-                <marker date="1573644329326" expanded="true" signature="6522:6823" ph="INSERT INTO MF_LZ1... " />
-                <marker date="1573644329326" expanded="true" signature="7173:7389" ph="INSERT INTO TF_LZ1... " />
-                <marker date="1573644329326" expanded="true" signature="7552:7609" ph="UPDATE TF_PS... " />
-                <marker date="1573644329326" expanded="true" signature="8122:8350" ph="INSERT INTO MF_PSS... " />
-                <marker date="1573644329326" expanded="true" signature="8733:8910" ph="INSERT INTO TF_PSS... " />
-                <marker date="1573644329326" expanded="true" signature="9141:9356" ph="INSERT INTO MF_ARP... " />
-                <marker date="1573644329326" expanded="true" signature="13825:13938" ph="UPDATE MF_PS... " />
-                <marker date="1573644329326" expanded="true" signature="14262:14380" ph="UPDATE TF_PS... " />
-                <marker date="1573644329326" expanded="true" signature="14544:14729" ph="UPDATE INV_N... " />
-                <marker date="1573644329326" expanded="true" signature="15547:15665" ph="UPDATE MF_AR... " />
-                <marker date="1573644329326" expanded="true" signature="16325:16458" ph="UPDATE MF_LZ... " />
-                <marker date="1573644329326" expanded="true" signature="17065:17141" ph="UPDATE TF_LZ... " />
-                <marker date="1573644329326" expanded="true" signature="17409:17481" ph="UPDATE TF_PS... " />
-                <marker date="1573644329326" expanded="true" signature="17943:18056" ph="UPDATE MF_PS... " />
-                <marker date="1573644329326" expanded="true" signature="18411:18504" ph="UPDATE TF_PS... " />
-                <marker date="1573644329326" expanded="true" signature="18724:18832" ph="UPDATE MF_AR... " />
-                <marker date="1573644329326" expanded="true" signature="20823:20860" ph="SELECT COUNT... missing_value" />
-                <marker date="1573644329326" expanded="true" signature="21160:21209" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="21294:21343" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="21425:21475" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="21555:21606" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="21690:21738" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="21834:21882" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="22315:22352" ph="SELECT COUNT... missing_value" />
-                <marker date="1573644329326" expanded="true" signature="22619:22667" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="22763:22811" ph="DELETE FROM " />
-                <marker date="1573644329326" expanded="true" signature="22907:22957" ph="DELETE FROM " />
-              </folding>
+            <state relative-caret-position="189">
+              <caret line="8" column="23" lean-forward="false" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="23" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="cust_data.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/awj/awj/utils/cust_data.py">
+      <file leaf-file-name="views.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="513">
-              <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+            <state relative-caret-position="192">
+              <caret line="1515" column="6" lean-forward="true" selection-start-line="1515" selection-start-column="6" selection-end-line="1515" selection-end-column="6" />
               <folding>
-                <marker date="1573644366090" expanded="true" signature="287:328" ph="SELECT COUNT... CUST" />
-                <marker date="1573644366090" expanded="true" signature="429:866" ph="INSERT INTO CUST... " />
+                <element signature="e#557#714#0" expanded="false" />
+                <element signature="e#777#11399#0" expanded="false" />
+                <element signature="e#11461#22232#0" expanded="false" />
+                <element signature="e#22297#24918#0" expanded="false" />
+                <element signature="e#24951#49045#0" expanded="false" />
+                <element signature="e#25007#25165#0" expanded="false" />
+                <element signature="e#25228#36085#0" expanded="false" />
+                <element signature="e#36147#46475#0" expanded="false" />
+                <element signature="e#46540#49042#0" expanded="false" />
+                <element signature="e#49078#67624#0" expanded="false" />
+                <element signature="e#49285#58880#0" expanded="false" />
+                <element signature="e#58943#65764#0" expanded="false" />
+                <element signature="e#65829#67622#0" expanded="false" />
+                <element signature="e#67691#69850#0" expanded="false" />
+                <element signature="e#69967#72127#0" expanded="false" />
+                <element signature="e#74975#76801#0" expanded="false" />
+                <element signature="e#77273#79219#0" expanded="false" />
+                <marker date="1577427398893" expanded="true" signature="4467:4527" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1577427398893" expanded="true" signature="4829:4891" ph="SELECT ISNUL... " />
+                <marker date="1577427398893" expanded="true" signature="5756:5986" ph="INSERT INTO MF_PSS... " />
+                <marker date="1577427398893" expanded="true" signature="6964:7017" ph="INSERT INTO MF_PSS_Z... " />
+                <marker date="1577427398893" expanded="true" signature="7154:7386" ph="INSERT INTO MF_ARP... " />
+                <marker date="1577427398893" expanded="true" signature="8313:8545" ph="INSERT INTO MF_PSS... " />
+                <marker date="1577427398893" expanded="true" signature="9487:9692" ph="INSERT INTO TF_PSS... " />
+                <marker date="1577427398893" expanded="true" signature="14710:14767" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="14938:15007" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1577427398893" expanded="true" signature="15276:15345" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="15747:15807" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1577427398893" expanded="true" signature="16109:16171" ph="SELECT ISNUL... " />
+                <marker date="1577427398893" expanded="true" signature="17081:17138" ph="UPDATE MF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="17236:17293" ph="UPDATE MF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="17428:17566" ph="UPDATE MF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="18401:18519" ph="UPDATE MF_AR... " />
+                <marker date="1577427398893" expanded="true" signature="19144:19371" ph="INSERT INTO MF_ARP... " />
+                <marker date="1577427398893" expanded="true" signature="20388:20526" ph="UPDATE MF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="21134:21184" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="21373:21484" ph="UPDATE TF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="23150:23207" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="23427:23496" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1577427398893" expanded="true" signature="23811:23880" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="24280:24329" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="24389:24438" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="24498:24549" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="29498:29558" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1577427398893" expanded="true" signature="29860:29922" ph="SELECT ISNUL... " />
+                <marker date="1577427398893" expanded="true" signature="30813:31066" ph="INSERT INTO MF_PSS... " />
+                <marker date="1577427398893" expanded="true" signature="32197:32433" ph="INSERT INTO MF_ARP... " />
+                <marker date="1577427398893" expanded="true" signature="33361:33616" ph="INSERT INTO MF_PSS... " />
+                <marker date="1577427398893" expanded="true" signature="34677:34886" ph="INSERT INTO TF_PSS... " />
+                <marker date="1577427398893" expanded="true" signature="39329:39386" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="39647:39716" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1577427398893" expanded="true" signature="40031:40100" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="40552:40612" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1577427398893" expanded="true" signature="40914:40976" ph="SELECT ISNUL... " />
+                <marker date="1577427398893" expanded="true" signature="41921:42059" ph="UPDATE MF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="42774:42892" ph="UPDATE MF_AR... " />
+                <marker date="1577427398893" expanded="true" signature="43454:43685" ph="INSERT INTO MF_ARP... " />
+                <marker date="1577427398893" expanded="true" signature="44702:44840" ph="UPDATE MF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="45448:45498" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="45708:45819" ph="UPDATE TF_PS... " />
+                <marker date="1577427398893" expanded="true" signature="47274:47331" ph="SELECT ZHANG... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="47551:47620" ph="SELECT ISNUL... MF_ARP" />
+                <marker date="1577427398893" expanded="true" signature="47935:48004" ph="SELECT ISNUL... MF_PSS" />
+                <marker date="1577427398893" expanded="true" signature="48404:48453" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="48513:48562" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="48622:48673" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="52985:53045" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1577427398893" expanded="true" signature="53361:53412" ph="SELECT ISNUL... BACC" />
+                <marker date="1577427398893" expanded="true" signature="53863:54157" ph="INSERT INTO TF_MON... " />
+                <marker date="1577427398893" expanded="true" signature="55629:55909" ph="INSERT INTO TF_MON... " />
+                <marker date="1577427398893" expanded="true" signature="56321:56456" ph="INSERT INTO MF_MON... " />
+                <marker date="1577427398893" expanded="true" signature="56885:57108" ph="INSERT INTO MF_BAC... " />
+                <marker date="1577427398893" expanded="true" signature="57963:58117" ph="INSERT INTO TF_BAC... " />
+                <marker date="1577427398893" expanded="true" signature="62786:62846" ph="SELECT COUNT... MF_VHID" />
+                <marker date="1577427398893" expanded="true" signature="63187:63238" ph="SELECT ISNUL... BACC" />
+                <marker date="1577427398893" expanded="true" signature="63714:63867" ph="UPDATE TF_MO... " />
+                <marker date="1577427398893" expanded="true" signature="64236:64390" ph="UPDATE TF_MO... " />
+                <marker date="1577427398893" expanded="true" signature="64655:64704" ph="UPDATE MF_MO... " />
+                <marker date="1577427398893" expanded="true" signature="64892:64979" ph="UPDATE MF_BA... " />
+                <marker date="1577427398893" expanded="true" signature="65256:65315" ph="UPDATE TF_BA... " />
+                <marker date="1577427398893" expanded="true" signature="66869:66916" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="66990:67038" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="67114:67147" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="67235:67268" ph="DELETE FROM " />
+                <marker date="1577427398893" expanded="true" signature="67788:67867" ph="SELECT table... TABLES" />
+                <marker date="1577427398893" expanded="true" signature="68059:68090" ph="SELECT COUNT... MF_LZ1_Z01" />
+                <marker date="1577427398893" expanded="true" signature="68272:68827" ph="SELECT ISNUL... MF_LZ1_Z01" />
+                <marker date="1577427398893" expanded="true" signature="69637:69682" ph="UPDATE MF_LZ... " />
+                <marker date="1577427398893" expanded="true" signature="70016:70094" ph="SELECT table... TABLES" />
+                <marker date="1577427398893" expanded="true" signature="70286:70316" ph="SELECT COUNT... MF_LZ_Z01" />
+                <marker date="1577427398893" expanded="true" signature="70503:71056" ph="SELECT ISNUL... MF_LZ_Z01" />
+                <marker date="1577427398893" expanded="true" signature="71889:71933" ph="UPDATE MF_LZ... " />
+                <marker date="1577427398893" expanded="true" signature="72661:72739" ph="SELECT table... TABLES" />
+                <marker date="1577427398893" expanded="true" signature="72930:72960" ph="SELECT COUNT... TC_MON_PC" />
+                <marker date="1577427398893" expanded="true" signature="73147:73628" ph="SELECT ISNUL... TC_MON_PC" />
+                <marker date="1577427398893" expanded="true" signature="74215:74259" ph="UPDATE TC_MO... " />
+                <marker date="1577427398893" expanded="true" signature="75024:75102" ph="SELECT table... TABLES" />
+                <marker date="1577427398893" expanded="true" signature="75293:75323" ph="SELECT COUNT... TC_MON_PC" />
+                <marker date="1577427398893" expanded="true" signature="75510:75955" ph="SELECT ISNUL... TC_MON_PC" />
+                <marker date="1577427398893" expanded="true" signature="76562:76606" ph="UPDATE TC_MO... " />
+                <marker date="1577427398893" expanded="true" signature="77370:77448" ph="SELECT table... TABLES" />
+                <marker date="1577427398893" expanded="true" signature="77639:77669" ph="SELECT COUNT... TC_MON_PC" />
+                <marker date="1577427398893" expanded="true" signature="77856:78373" ph="SELECT ISNUL... TC_MON_PC" />
+                <marker date="1577427398893" expanded="true" signature="78980:79024" ph="UPDATE TC_MO... " />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/urls.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="81">
-              <caret line="4" column="50" lean-forward="true" selection-start-line="4" selection-start-column="50" selection-end-line="4" selection-end-column="50" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -132,7 +162,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>LOGGING</find>
       <find>TITLE_BUY</find>
       <find>UNI_NO_PAY</find>
       <find>SAL_ADR</find>
@@ -157,6 +186,12 @@
       <find>JsonResponse</find>
       <find>CACC_NO</find>
       <find>TF_MON</find>
+      <find>AMT</find>
+      <find>customer_data</find>
+      <find>TAX_RTO</find>
+      <find>CNT_MAN2</find>
+      <find>form-container</find>
+      <find>MF_PSS_</find>
     </findStrings>
     <replaceStrings>
       <replace>安装费用</replace>
@@ -183,24 +218,27 @@
         <option value="$PROJECT_DIR$/awj/awj/utils/invoice_dh.py" />
         <option value="$PROJECT_DIR$/awj/awj/utils/examine_ood.py" />
         <option value="$PROJECT_DIR$/awj/logs/hwj.log" />
-        <option value="$PROJECT_DIR$/awj/awj/urls.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/salesinvoice/urls.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/stockinvoice/xixi.py" />
         <option value="$PROJECT_DIR$/Apache24/conf/extra/httpd-ssl.conf" />
-        <option value="$PROJECT_DIR$/awj/awj/wsgi.py" />
         <option value="$PROJECT_DIR$/Apache24/conf/httpd.conf" />
         <option value="$PROJECT_DIR$/awj/manage.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/stockinvoice/urls.py" />
         <option value="$PROJECT_DIR$/qqq.txt" />
-        <option value="$PROJECT_DIR$/awj/awj/utils/middleware.py" />
-        <option value="$PROJECT_DIR$/awj/awj/setting/dev.py" />
-        <option value="$PROJECT_DIR$/awj/awj/utils/usr_data.py" />
         <option value="$PROJECT_DIR$/awj/awj/utils/et_CACC_NO.py" />
-        <option value="$PROJECT_DIR$/awj/awj/utils/if_account.py" />
+        <option value="$PROJECT_DIR$/awj/awj/utils/middleware.py" />
+        <option value="$PROJECT_DIR$/awj/awj/urls.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/salesinvoice/views.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/PaymentOperation/views.py" />
         <option value="$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py" />
+        <option value="$PROJECT_DIR$/awj/awj/utils/usr_data.py" />
+        <option value="$PROJECT_DIR$/awj/awj/utils/if_account.py" />
         <option value="$PROJECT_DIR$/awj/awj/utils/cust_data.py" />
+        <option value="$PROJECT_DIR$/awj/awj/apps/erp/views - 副本.py" />
+        <option value="$PROJECT_DIR$/awj/awj/apps/erp/urls.py" />
+        <option value="$PROJECT_DIR$/awj/awj/setting/dev.py" />
+        <option value="$PROJECT_DIR$/awj/awj/wsgi.py" />
+        <option value="$PROJECT_DIR$/awj/awj/apps/erp/views.py" />
       </list>
     </option>
   </component>
@@ -231,8 +269,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -259,8 +295,76 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="apps" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="wanjia" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="awj" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="apps" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="erp" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -269,16 +373,17 @@
     <property name="WebServerToolWindowFactoryState" value="true" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\stockinvoice" />
-      <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\setting" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\erp" />
       <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\salesinvoice" />
       <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\utils" />
       <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\stockinvoice" />
       <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\PaymentOperation" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\apps\stockinvoice" />
+      <recent name="E:\12446\PycharmProjects\wangli\wanjia\awj\awj\setting" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -293,77 +398,77 @@
     </option>
   </component>
   <component name="RunManager" selected="Python.manage">
-    <configuration default="false" name="lianxi" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="xixi" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/setting" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/apps" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="wanjia" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/setting/lianxi.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/apps/xixi.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <method />
     </configuration>
-    <configuration default="false" name="xixi" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="xixi (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/apps" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/apps/stockinvoice" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="wanjia" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/apps/xixi.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/apps/stockinvoice/xixi.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <method />
     </configuration>
-    <configuration default="false" name="xixi (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="payment_order" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/apps/stockinvoice" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/utils" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="wanjia" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/apps/stockinvoice/xixi.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/utils/payment_order.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <method />
     </configuration>
-    <configuration default="false" name="payment_order" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration default="false" name="views - 副本" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/utils" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/awj/awj/apps/erp" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <module name="wanjia" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/utils/payment_order.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/awj/apps/erp/views - 副本.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -383,7 +488,7 @@
       <module name="wanjia" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/awj/manage.py" />
-      <option name="PARAMETERS" value="runserver 0.0.0.0:8000" />
+      <option name="PARAMETERS" value="runserver 0.0.0.0:8899" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <method />
@@ -537,19 +642,19 @@
       <method />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="Python.lianxi" />
-      <item index="1" class="java.lang.String" itemvalue="Python.xixi" />
-      <item index="2" class="java.lang.String" itemvalue="Python.xixi (1)" />
-      <item index="3" class="java.lang.String" itemvalue="Python.payment_order" />
+      <item index="0" class="java.lang.String" itemvalue="Python.xixi" />
+      <item index="1" class="java.lang.String" itemvalue="Python.xixi (1)" />
+      <item index="2" class="java.lang.String" itemvalue="Python.payment_order" />
+      <item index="3" class="java.lang.String" itemvalue="Python.views - 副本" />
       <item index="4" class="java.lang.String" itemvalue="Python.manage" />
     </list>
     <recent_temporary>
       <list size="5">
         <item index="0" class="java.lang.String" itemvalue="Python.manage" />
-        <item index="1" class="java.lang.String" itemvalue="Python.xixi (1)" />
-        <item index="2" class="java.lang.String" itemvalue="Python.payment_order" />
-        <item index="3" class="java.lang.String" itemvalue="Python.xixi" />
-        <item index="4" class="java.lang.String" itemvalue="Python.lianxi" />
+        <item index="1" class="java.lang.String" itemvalue="Python.views - 副本" />
+        <item index="2" class="java.lang.String" itemvalue="Python.xixi (1)" />
+        <item index="3" class="java.lang.String" itemvalue="Python.payment_order" />
+        <item index="4" class="java.lang.String" itemvalue="Python.xixi" />
       </list>
     </recent_temporary>
   </component>
@@ -680,20 +785,21 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329718" sideWeight="0.5021322" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23101953" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329718" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30802602" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26898047" sideWeight="0.4978678" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32321042" sideWeight="0.4978678" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15458423" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15884861" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45770064" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -718,11 +824,14 @@
     <MESSAGE value="今天代7点的码结束" />
     <MESSAGE value="调整银行编码判断" />
     <MESSAGE value="代码结束" />
-    <option name="LAST_COMMIT_MESSAGE" value="代码结束" />
+    <MESSAGE value="2019114-1327" />
+    <MESSAGE value="客户编码" />
+    <MESSAGE value="接口测试" />
+    <option name="LAST_COMMIT_MESSAGE" value="接口测试" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="22" />
+      <option name="time" value="26" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="PythonConfigurationType">
@@ -731,72 +840,6 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://F:/python/03Django/02Django_上上项目/0610_day14/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/oauth/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2651">
-          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://F:/python/03Django/02Django_上上项目/0610_day14/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/orders/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5702">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://F:/python/03Django/02Django_上上项目/0610_day14/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/payment/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://F:/python/03Django/02Django_上上项目/0618_day17_drf/2_code/day17/booktest/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="162" column="34" lean-forward="false" selection-start-line="162" selection-start-column="6" selection-end-line="162" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://F:/python/03Django/02Django_上上项目/0618_day17_drf/2_code/day17/booktest/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="12" column="74" lean-forward="false" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils.py" />
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/PaymentOperation/apps.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/apps.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="3" column="19" lean-forward="false" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/tests.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/xixi.py" />
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/payment_order.py" />
-    <entry file="file://$USER_HOME$/Envs/awj/Lib/site-packages/django/utils/deprecation.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../../AppData/Lib/_strptime.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="358">
@@ -853,13 +896,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="454">
-          <caret line="22" column="44" lean-forward="true" selection-start-line="22" selection-start-column="44" selection-end-line="22" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Envs/awj/Lib/site-packages/django/http/response.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="157">
@@ -904,13 +940,6 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Apache24/conf/extra/httpd-ssl.conf" />
     <entry file="file://$PROJECT_DIR$/Apache24/conf/httpd.conf" />
-    <entry file="file://$PROJECT_DIR$/awj/awj/wsgi.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Envs/ceshi/Lib/site-packages/django/db/backends/base/base.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -918,435 +947,317 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/qqq.txt" />
     <entry file="file://$USER_HOME$/Envs/ceshi/Lib/site-packages/django/http/response.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="296">
           <caret line="550" column="28" lean-forward="true" selection-start-line="550" selection-start-column="28" selection-end-line="550" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://F:/python/03Django/02Django_上上项目/0609_day13/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/users/views.py">
+    <entry file="file://F:/python/03Django/02Django_上上项目/0609_day13/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/orders/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="458" column="32" lean-forward="false" selection-start-line="458" selection-start-column="20" selection-end-line="458" selection-end-column="32" />
+        <state relative-caret-position="193">
+          <caret line="189" column="32" lean-forward="false" selection-start-line="189" selection-start-column="20" selection-end-line="189" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://F:/python/03Django/02Django_上上项目/0609_day13/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/orders/views.py">
+    <entry file="file://$PROJECT_DIR$/red.txt" />
+    <entry file="file://$PROJECT_DIR$/awj/awj/utils/invoice_dh.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="189" column="32" lean-forward="false" selection-start-line="189" selection-start-column="20" selection-end-line="189" selection-end-column="32" />
+        <state relative-caret-position="270">
+          <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/RED.txt" />
-    <entry file="file://$PROJECT_DIR$/awj/manage.py">
+    <entry file="file://$USER_HOME$/Downloads/wanjia-master/wanjia/awj/awj/apps/PaymentOperation/views.py" />
+    <entry file="file://$USER_HOME$/Downloads/wanjia-dev/wanjia/awj/awj/apps/PaymentOperation/views.py" />
+    <entry file="file://$USER_HOME$/Downloads/wanjia-dev (1)/wanjia/awj/awj/utils/cust_data.py" />
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/apps.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
-          <caret line="4" column="26" lean-forward="false" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
+          <caret line="4" column="16" lean-forward="true" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/examine_ood.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="18" selection-end-column="24" />
-          <folding>
-            <marker date="1572003251822" expanded="true" signature="247:296" ph="SELECT COUNT... missing_value" />
-          </folding>
+        <state relative-caret-position="400">
+          <caret line="23" column="26" lean-forward="false" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/invoice_dh.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        <state relative-caret-position="54">
+          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/PaymentOperation/urls.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/utils/middleware.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="22" column="60" lean-forward="false" selection-start-line="22" selection-start-column="60" selection-end-line="22" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/awj/manage.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
-          <caret line="5" column="29" lean-forward="false" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="29" />
+          <caret line="5" column="61" lean-forward="false" selection-start-line="5" selection-start-column="61" selection-end-line="5" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/setting/dev.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/PaymentOperation/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1377">
-          <caret line="51" column="45" lean-forward="false" selection-start-line="51" selection-start-column="45" selection-end-line="51" selection-end-column="45" />
+        <state relative-caret-position="54">
+          <caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/et_CACC_NO.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/utils/examine_ood.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="17" selection-end-column="19" />
-          <folding>
-            <marker date="1573609237112" expanded="true" signature="184:224" ph="SELECT COUNT... BACC" />
-          </folding>
+        <state relative-caret-position="297">
+          <caret line="11" column="26" lean-forward="false" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/middleware.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/PaymentOperation/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="10" column="20" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="20" />
-          <folding />
+        <state relative-caret-position="189">
+          <caret line="19" column="33" lean-forward="true" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/salesinvoice/urls.py">
+    <entry file="file://F:/python/03Django/02Django_上上项目/0609_day13/2_code/meiduo12/meiduo_mall/meiduo_mall/apps/users/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="6" column="26" lean-forward="false" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="26" />
-          <folding />
+        <state relative-caret-position="369">
+          <caret line="438" column="63" lean-forward="true" selection-start-line="438" selection-start-column="63" selection-end-line="438" selection-end-column="63" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/PaymentOperation/views.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/utils/usr_data.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="389" column="34" lean-forward="false" selection-start-line="389" selection-start-column="34" selection-end-line="389" selection-end-column="34" />
-          <folding>
-            <element signature="e#517#1269#0" expanded="false" />
-            <element signature="e#1333#9411#0" expanded="false" />
-            <element signature="e#5224#5245#0" expanded="false" />
-            <element signature="e#9473#15841#0" expanded="false" />
-            <element signature="e#15906#19667#0" expanded="false" />
-            <element signature="e#19715#34316#0" expanded="false" />
-            <element signature="e#19901#26636#0" expanded="false" />
-            <element signature="e#34365#54961#0" expanded="false" />
-            <element signature="e#34421#35233#0" expanded="false" />
-            <element signature="e#35297#43851#0" expanded="false" />
-            <element signature="e#43913#51332#0" expanded="false" />
-            <element signature="e#51397#54961#0" expanded="false" />
-            <marker date="1573640113963" expanded="true" signature="999:1047" ph="SELECT AMTN MF_MON" />
-            <marker date="1573640113963" expanded="true" signature="3307:3350" ph="SELECT COUNT... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="3553:3604" ph="SELECT ISNUL... BACC" />
-            <marker date="1573640113963" expanded="true" signature="4061:4323" ph="INSERT INTO TF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="4702:4968" ph="INSERT INTO TF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="5917:6054" ph="INSERT INTO TC_MON... " />
-            <marker date="1573640113963" expanded="true" signature="6470:6592" ph="INSERT INTO MF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="6862:7073" ph="INSERT INTO MF_BAC... " />
-            <marker date="1573640113963" expanded="true" signature="7902:8040" ph="INSERT INTO TF_BAC... " />
-            <marker date="1573640113963" expanded="true" signature="8398:8503" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="8760:8808" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="8938:8984" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="9036:9092" ph="UPDATE MF_PS... " />
-            <marker date="1573640113963" expanded="true" signature="11446:11489" ph="SELECT COUNT... TC_MON" />
-            <marker date="1573640113963" expanded="true" signature="11692:11732" ph="SELECT Acc_N... BACC" />
-            <marker date="1573640113963" expanded="true" signature="11936:11991" ph="SELECT AMTN_... TF_MON" />
-            <marker date="1573640113963" expanded="true" signature="12221:12338" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="12741:12858" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="12997:13064" ph="UPDATE TC_MO... " />
-            <marker date="1573640113963" expanded="true" signature="13380:13463" ph="UPDATE MF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="13725:13810" ph="UPDATE MF_BA... " />
-            <marker date="1573640113963" expanded="true" signature="14319:14383" ph="UPDATE TF_BA... " />
-            <marker date="1573640113963" expanded="true" signature="14716:14823" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="15114:15192" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="15333:15395" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="15448:15519" ph="UPDATE MF_PS... " />
-            <marker date="1573640113963" expanded="true" signature="16699:16765" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573640113963" expanded="true" signature="16856:16910" ph="SELECT ARP_N... TC_MON" />
-            <marker date="1573640113963" expanded="true" signature="17052:17107" ph="SELECT AMTN_... TF_MON" />
-            <marker date="1573640113963" expanded="true" signature="17357:17405" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="17475:17523" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="17895:17942" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="18250:18299" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="18385:18434" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="18555:18594" ph="SELECT AMTN MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="18794:18844" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="18995:19097" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="19192:19238" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="19287:19343" ph="UPDATE MF_PS... " />
-            <marker date="1573640113963" expanded="true" signature="22365:22416" ph="SELECT ISNUL... BACC" />
-            <marker date="1573640113963" expanded="true" signature="22712:22975" ph="INSERT INTO TF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="23298:23562" ph="INSERT INTO TF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="24501:24631" ph="INSERT INTO MF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="24911:25122" ph="INSERT INTO MF_BAC... " />
-            <marker date="1573640113963" expanded="true" signature="25920:26056" ph="INSERT INTO TF_BAC... " />
-            <marker date="1573640113963" expanded="true" signature="29266:29306" ph="SELECT Acc_N... BACC" />
-            <marker date="1573640113963" expanded="true" signature="29752:29862" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="30278:30388" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="30888:30937" ph="UPDATE MF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="31216:31296" ph="UPDATE MF_BA... " />
-            <marker date="1573640113963" expanded="true" signature="31811:31870" ph="UPDATE TF_BA... " />
-            <marker date="1573640113963" expanded="true" signature="33594:33641" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="33715:33763" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="33838:33871" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="33956:33989" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="34792:34842" ph="update cust " />
-            <marker date="1573640113963" expanded="true" signature="34881:34937" ph="insert into cust... " />
-            <marker date="1573640113963" expanded="true" signature="38078:38117" ph="SELECT AMTN MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="38505:38622" ph="INSERT INTO TF_MON1... " />
-            <marker date="1573640113963" expanded="true" signature="38832:39073" ph="INSERT INTO TF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="40005:40148" ph="INSERT INTO TC_MON... " />
-            <marker date="1573640113963" expanded="true" signature="40928:41033" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="41570:41639" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="41794:41840" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="41898:41969" ph="UPDATE MF_PS... " />
-            <marker date="1573640113963" expanded="true" signature="42089:42193" ph="INSERT INTO MF_MON... " />
-            <marker date="1573640113963" expanded="true" signature="42575:42652" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="42828:42937" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573640113963" expanded="true" signature="43081:43139" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="46204:46243" ph="SELECT AMTN MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="46545:46605" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="46809:46916" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="47538:47591" ph="SELECT ISNUL... TC_MON" />
-            <marker date="1573640113963" expanded="true" signature="47768:47827" ph="UPDATE TC_MO... " />
-            <marker date="1573640113963" expanded="true" signature="48484:48552" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="48752:48863" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="49184:49253" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="49408:49454" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="49512:49583" ph="UPDATE MF_PS... " />
-            <marker date="1573640113963" expanded="true" signature="49714:49773" ph="UPDATE MF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="50080:50160" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="50343:50452" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573640113963" expanded="true" signature="50618:50676" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="52203:52269" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573640113963" expanded="true" signature="52371:52426" ph="SELECT IRP_N... TF_MON1" />
-            <marker date="1573640113963" expanded="true" signature="52519:52596" ph="UPDATE TF_MO... " />
-            <marker date="1573640113963" expanded="true" signature="52709:52763" ph="SELECT ARP_N... TC_MON" />
-            <marker date="1573640113963" expanded="true" signature="53150:53218" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="53416:53521" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="53819:53888" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573640113963" expanded="true" signature="53994:54040" ph="UPDATE MF_AR... " />
-            <marker date="1573640113963" expanded="true" signature="54095:54151" ph="UPDATE MF_PS... " />
-            <marker date="1573640113963" expanded="true" signature="54233:54281" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="54354:54401" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="54474:54521" ph="DELETE FROM " />
-            <marker date="1573640113963" expanded="true" signature="54593:54640" ph="DELETE FROM " />
-          </folding>
+        <state relative-caret-position="351">
+          <caret line="13" column="15" lean-forward="true" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/awj/awj/utils/if_account.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="8" column="7" lean-forward="true" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
-          <folding>
-            <marker date="1573637717721" expanded="true" signature="184:225" ph="SELECT Bacc_... BACC" />
-          </folding>
+        <state relative-caret-position="297">
+          <caret line="12" column="67" lean-forward="true" selection-start-line="12" selection-start-column="67" selection-end-line="12" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/awj/awj/utils/et_CACC_NO.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="351">
+          <caret line="14" column="18" lean-forward="true" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/awj/awj/apps/salesinvoice/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="307" column="25" lean-forward="false" selection-start-line="307" selection-start-column="25" selection-end-line="307" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-            <element signature="e#439#16357#0" expanded="false" />
-            <element signature="e#495#659#0" expanded="false" />
-            <element signature="e#722#7189#0" expanded="false" />
-            <element signature="e#7252#13451#0" expanded="false" />
-            <element signature="e#13516#16355#0" expanded="false" />
-            <element signature="e#16395#30930#0" expanded="false" />
-            <element signature="e#16451#16543#0" expanded="false" />
-            <element signature="e#16606#22803#0" expanded="false" />
-            <element signature="e#22866#28054#0" expanded="false" />
-            <element signature="e#28119#30928#0" expanded="false" />
-            <element signature="e#30973#43447#0" expanded="false" />
-            <element signature="e#31029#31143#0" expanded="false" />
-            <element signature="e#31206#36966#0" expanded="false" />
-            <element signature="e#37029#41718#0" expanded="false" />
-            <element signature="e#41783#43445#0" expanded="false" />
-            <element signature="e#43490#59957#0" expanded="false" />
-            <element signature="e#43546#43904#0" expanded="false" />
-            <element signature="e#43967#50259#0" expanded="false" />
-            <element signature="e#44020#44037#0" expanded="false" />
-            <element signature="e#44415#44418#0" expanded="false" />
-            <element signature="e#50321#56498#0" expanded="false" />
-            <element signature="e#56563#59957#0" expanded="false" />
-            <marker date="1573639239358" expanded="true" signature="3866:4065" ph="INSERT INTO MF_PSS... " />
-            <marker date="1573639239358" expanded="true" signature="4359:4551" ph="INSERT INTO TF_PSS... " />
-            <marker date="1573639239358" expanded="true" signature="4700:4945" ph="INSERT INTO INV_NO... " />
-            <marker date="1573639239358" expanded="true" signature="5197:5396" ph="INSERT INTO MF_ARP... " />
-            <marker date="1573639239358" expanded="true" signature="5681:5951" ph="INSERT INTO MF_LZ... " />
-            <marker date="1573639239358" expanded="true" signature="6315:6534" ph="INSERT INTO TF_LZ... " />
-            <marker date="1573639239358" expanded="true" signature="6698:6809" ph="UPDATE TF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="11053:11166" ph="UPDATE MF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="11350:11468" ph="UPDATE TF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="11683:11868" ph="UPDATE INV_N... " />
-            <marker date="1573639239358" expanded="true" signature="12092:12210" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="12453:12585" ph="UPDATE MF_LZ... " />
-            <marker date="1573639239358" expanded="true" signature="12818:12893" ph="UPDATE TF_LZ... " />
-            <marker date="1573639239358" expanded="true" signature="13002:13074" ph="UPDATE TF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="14860:14897" ph="SELECT COUNT... missing_value" />
-            <marker date="1573639239358" expanded="true" signature="15260:15308" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="15393:15441" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="15524:15574" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="15655:15706" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="15790:15838" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="15934:15982" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="18616:18659" ph="SELECT COUNT... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="18861:18912" ph="SELECT ISNUL... BACC" />
-            <marker date="1573639239358" expanded="true" signature="19239:19503" ph="INSERT INTO TF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="19871:20136" ph="INSERT INTO TF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="20432:20569" ph="INSERT INTO TC_MON... " />
-            <marker date="1573639239358" expanded="true" signature="20729:20851" ph="INSERT INTO MF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="21000:21211" ph="INSERT INTO MF_BAC... " />
-            <marker date="1573639239358" expanded="true" signature="21523:21661" ph="INSERT INTO TF_BAC... " />
-            <marker date="1573639239358" expanded="true" signature="21812:21917" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="22176:22224" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="22324:22370" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="22423:22479" ph="UPDATE MF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="24710:24753" ph="SELECT COUNT... TC_MON" />
-            <marker date="1573639239358" expanded="true" signature="24958:24998" ph="SELECT Acc_N... BACC" />
-            <marker date="1573639239358" expanded="true" signature="25202:25257" ph="SELECT AMTN_... TF_MON" />
-            <marker date="1573639239358" expanded="true" signature="25512:25629" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="25864:25981" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="26120:26187" ph="UPDATE TC_MO... " />
-            <marker date="1573639239358" expanded="true" signature="26277:26360" ph="UPDATE MF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="26520:26605" ph="UPDATE MF_BA... " />
-            <marker date="1573639239358" expanded="true" signature="26808:26872" ph="UPDATE TF_BA... " />
-            <marker date="1573639239358" expanded="true" signature="27068:27175" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="27330:27415" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="27546:27608" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="27661:27732" ph="UPDATE MF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="28618:28684" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573639239358" expanded="true" signature="28775:28829" ph="SELECT ARP_N... TC_MON" />
-            <marker date="1573639239358" expanded="true" signature="28971:29026" ph="SELECT AMTN_... TF_MON" />
-            <marker date="1573639239358" expanded="true" signature="29184:29232" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="29306:29354" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="29428:29475" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="29551:29600" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="29688:29737" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="29857:29896" ph="SELECT AMTN MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="30052:30102" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="30254:30356" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="30451:30497" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="30546:30602" ph="UPDATE MF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="33651:33702" ph="SELECT ISNUL... BACC" />
-            <marker date="1573639239358" expanded="true" signature="34055:34332" ph="INSERT INTO TF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="34779:35058" ph="INSERT INTO TF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="35436:35582" ph="INSERT INTO MF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="35745:35972" ph="INSERT INTO MF_BAC... " />
-            <marker date="1573639239358" expanded="true" signature="36393:36545" ph="INSERT INTO TF_BAC... " />
-            <marker date="1573639239358" expanded="true" signature="39685:39725" ph="SELECT Acc_N... BACC" />
-            <marker date="1573639239358" expanded="true" signature="40048:40158" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="40447:40557" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="40779:40828" ph="UPDATE MF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="40960:41040" ph="UPDATE MF_BA... " />
-            <marker date="1573639239358" expanded="true" signature="41239:41298" ph="UPDATE TF_BA... " />
-            <marker date="1573639239358" expanded="true" signature="42718:42765" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="42839:42887" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="42963:42996" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="43084:43117" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="46578:46617" ph="SELECT AMTN MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="47003:47136" ph="INSERT INTO TF_MON1... " />
-            <marker date="1573639239358" expanded="true" signature="47227:47468" ph="INSERT INTO TF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="47940:48083" ph="INSERT INTO TC_MON... " />
-            <marker date="1573639239358" expanded="true" signature="48292:48397" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="48553:48622" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="48777:48823" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="48881:48952" ph="UPDATE MF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="49096:49200" ph="INSERT INTO MF_MON... " />
-            <marker date="1573639239358" expanded="true" signature="49382:49459" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="49631:49740" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573639239358" expanded="true" signature="49884:49942" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="52800:52839" ph="SELECT AMTN MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="53159:53219" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="53323:53430" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="53772:53825" ph="SELECT ISNUL... TC_MON" />
-            <marker date="1573639239358" expanded="true" signature="54053:54112" ph="UPDATE TC_MO... " />
-            <marker date="1573639239358" expanded="true" signature="54466:54534" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="54735:54846" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="55017:55086" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="55195:55241" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="55299:55370" ph="UPDATE MF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="55460:55519" ph="UPDATE MF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="55626:55706" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="55869:55978" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573639239358" expanded="true" signature="56123:56181" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="57371:57437" ph="SELECT ISNUL... TF_MON" />
-            <marker date="1573639239358" expanded="true" signature="57540:57595" ph="SELECT IRP_N... TF_MON1" />
-            <marker date="1573639239358" expanded="true" signature="57688:57765" ph="UPDATE TF_MO... " />
-            <marker date="1573639239358" expanded="true" signature="57878:57932" ph="SELECT ARP_N... TC_MON" />
-            <marker date="1573639239358" expanded="true" signature="58319:58387" ph="SELECT ISNUL... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="58585:58690" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="58813:58882" ph="SELECT CAST(... MF_ARP" />
-            <marker date="1573639239358" expanded="true" signature="58988:59034" ph="UPDATE MF_AR... " />
-            <marker date="1573639239358" expanded="true" signature="59089:59145" ph="UPDATE MF_PS... " />
-            <marker date="1573639239358" expanded="true" signature="59228:59276" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="59350:59397" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="59471:59519" ph="DELETE FROM " />
-            <marker date="1573639239358" expanded="true" signature="59592:59639" ph="DELETE FROM " />
-          </folding>
+        <state relative-caret-position="162">
+          <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/urls.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="4" column="50" lean-forward="true" selection-start-line="4" selection-start-column="50" selection-end-line="4" selection-end-column="50" />
-          <folding />
+        <state relative-caret-position="1215">
+          <caret line="204" column="8" lean-forward="false" selection-start-line="204" selection-start-column="8" selection-end-line="204" selection-end-column="69" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/utils/usr_data.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/views - 副本.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Downloads/wanjia-dev/wanjia/awj/awj/apps/erp/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-457">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/qqq.txt" />
+    <entry file="file://$PROJECT_DIR$/awj/awj/wsgi.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="351">
-          <caret line="13" column="15" lean-forward="true" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
-          <folding>
-            <marker date="1573548547689" expanded="true" signature="217:258" ph="SELECT COUNT... SALM" />
-            <marker date="1573548547689" expanded="true" signature="338:402" ph="INSERT INTO SALM... " />
-          </folding>
+          <caret line="13" column="49" lean-forward="false" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/awj/awj/apps/stockinvoice/views.py">
+    <entry file="file://$PROJECT_DIR$/awj/awj/setting/dev.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-378">
-          <caret line="18" column="27" lean-forward="false" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="27" />
-          <folding>
-            <element signature="e#10081#19332#0" expanded="false" />
-            <element signature="e#19398#23319#0" expanded="false" />
-            <marker date="1573644329326" expanded="true" signature="4690:4900" ph="INSERT INTO MF_PSS... " />
-            <marker date="1573644329326" expanded="true" signature="5164:5337" ph="INSERT INTO TF_PSS... " />
-            <marker date="1573644329326" expanded="true" signature="5487:5732" ph="INSERT INTO INV_NO... " />
-            <marker date="1573644329326" expanded="true" signature="6014:6213" ph="INSERT INTO MF_ARP... " />
-            <marker date="1573644329326" expanded="true" signature="6522:6823" ph="INSERT INTO MF_LZ1... " />
-            <marker date="1573644329326" expanded="true" signature="7173:7389" ph="INSERT INTO TF_LZ1... " />
-            <marker date="1573644329326" expanded="true" signature="7552:7609" ph="UPDATE TF_PS... " />
-            <marker date="1573644329326" expanded="true" signature="8122:8350" ph="INSERT INTO MF_PSS... " />
-            <marker date="1573644329326" expanded="true" signature="8733:8910" ph="INSERT INTO TF_PSS... " />
-            <marker date="1573644329326" expanded="true" signature="9141:9356" ph="INSERT INTO MF_ARP... " />
-            <marker date="1573644329326" expanded="true" signature="13825:13938" ph="UPDATE MF_PS... " />
-            <marker date="1573644329326" expanded="true" signature="14262:14380" ph="UPDATE TF_PS... " />
-            <marker date="1573644329326" expanded="true" signature="14544:14729" ph="UPDATE INV_N... " />
-            <marker date="1573644329326" expanded="true" signature="15547:15665" ph="UPDATE MF_AR... " />
-            <marker date="1573644329326" expanded="true" signature="16325:16458" ph="UPDATE MF_LZ... " />
-            <marker date="1573644329326" expanded="true" signature="17065:17141" ph="UPDATE TF_LZ... " />
-            <marker date="1573644329326" expanded="true" signature="17409:17481" ph="UPDATE TF_PS... " />
-            <marker date="1573644329326" expanded="true" signature="17943:18056" ph="UPDATE MF_PS... " />
-            <marker date="1573644329326" expanded="true" signature="18411:18504" ph="UPDATE TF_PS... " />
-            <marker date="1573644329326" expanded="true" signature="18724:18832" ph="UPDATE MF_AR... " />
-            <marker date="1573644329326" expanded="true" signature="20823:20860" ph="SELECT COUNT... missing_value" />
-            <marker date="1573644329326" expanded="true" signature="21160:21209" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="21294:21343" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="21425:21475" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="21555:21606" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="21690:21738" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="21834:21882" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="22315:22352" ph="SELECT COUNT... missing_value" />
-            <marker date="1573644329326" expanded="true" signature="22619:22667" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="22763:22811" ph="DELETE FROM " />
-            <marker date="1573644329326" expanded="true" signature="22907:22957" ph="DELETE FROM " />
-          </folding>
+        <state relative-caret-position="803">
+          <caret line="34" column="3" lean-forward="false" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/awj/awj/utils/cust_data.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="513">
-          <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+        <state relative-caret-position="540">
+          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/salesinvoice/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="8" column="1" lean-forward="false" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://F:/python/09web/Bootstrap/新闻网站案例/15.x-master/main/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="20" column="52" lean-forward="false" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://F:/python/09web/Bootstrap/新闻网站案例/15.x-master/main/signup.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="317">
+          <caret line="37" column="10" lean-forward="false" selection-start-line="37" selection-start-column="10" selection-end-line="37" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://F:/python/09web/Bootstrap/新闻网站案例/15.x-master/main/news.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://F:/python/09web/Bootstrap/新闻网站案例/15.x-master/main/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="8" column="23" lean-forward="false" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/awj/awj/apps/erp/views.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="1515" column="6" lean-forward="true" selection-start-line="1515" selection-start-column="6" selection-end-line="1515" selection-end-column="6" />
           <folding>
-            <marker date="1573644366090" expanded="true" signature="287:328" ph="SELECT COUNT... CUST" />
-            <marker date="1573644366090" expanded="true" signature="429:866" ph="INSERT INTO CUST... " />
+            <element signature="e#557#714#0" expanded="false" />
+            <element signature="e#777#11399#0" expanded="false" />
+            <element signature="e#11461#22232#0" expanded="false" />
+            <element signature="e#22297#24918#0" expanded="false" />
+            <element signature="e#24951#49045#0" expanded="false" />
+            <element signature="e#25007#25165#0" expanded="false" />
+            <element signature="e#25228#36085#0" expanded="false" />
+            <element signature="e#36147#46475#0" expanded="false" />
+            <element signature="e#46540#49042#0" expanded="false" />
+            <element signature="e#49078#67624#0" expanded="false" />
+            <element signature="e#49285#58880#0" expanded="false" />
+            <element signature="e#58943#65764#0" expanded="false" />
+            <element signature="e#65829#67622#0" expanded="false" />
+            <element signature="e#67691#69850#0" expanded="false" />
+            <element signature="e#69967#72127#0" expanded="false" />
+            <element signature="e#74975#76801#0" expanded="false" />
+            <element signature="e#77273#79219#0" expanded="false" />
+            <marker date="1577427398893" expanded="true" signature="4467:4527" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1577427398893" expanded="true" signature="4829:4891" ph="SELECT ISNUL... " />
+            <marker date="1577427398893" expanded="true" signature="5756:5986" ph="INSERT INTO MF_PSS... " />
+            <marker date="1577427398893" expanded="true" signature="6964:7017" ph="INSERT INTO MF_PSS_Z... " />
+            <marker date="1577427398893" expanded="true" signature="7154:7386" ph="INSERT INTO MF_ARP... " />
+            <marker date="1577427398893" expanded="true" signature="8313:8545" ph="INSERT INTO MF_PSS... " />
+            <marker date="1577427398893" expanded="true" signature="9487:9692" ph="INSERT INTO TF_PSS... " />
+            <marker date="1577427398893" expanded="true" signature="14710:14767" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="14938:15007" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1577427398893" expanded="true" signature="15276:15345" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="15747:15807" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1577427398893" expanded="true" signature="16109:16171" ph="SELECT ISNUL... " />
+            <marker date="1577427398893" expanded="true" signature="17081:17138" ph="UPDATE MF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="17236:17293" ph="UPDATE MF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="17428:17566" ph="UPDATE MF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="18401:18519" ph="UPDATE MF_AR... " />
+            <marker date="1577427398893" expanded="true" signature="19144:19371" ph="INSERT INTO MF_ARP... " />
+            <marker date="1577427398893" expanded="true" signature="20388:20526" ph="UPDATE MF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="21134:21184" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="21373:21484" ph="UPDATE TF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="23150:23207" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="23427:23496" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1577427398893" expanded="true" signature="23811:23880" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="24280:24329" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="24389:24438" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="24498:24549" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="29498:29558" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1577427398893" expanded="true" signature="29860:29922" ph="SELECT ISNUL... " />
+            <marker date="1577427398893" expanded="true" signature="30813:31066" ph="INSERT INTO MF_PSS... " />
+            <marker date="1577427398893" expanded="true" signature="32197:32433" ph="INSERT INTO MF_ARP... " />
+            <marker date="1577427398893" expanded="true" signature="33361:33616" ph="INSERT INTO MF_PSS... " />
+            <marker date="1577427398893" expanded="true" signature="34677:34886" ph="INSERT INTO TF_PSS... " />
+            <marker date="1577427398893" expanded="true" signature="39329:39386" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="39647:39716" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1577427398893" expanded="true" signature="40031:40100" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="40552:40612" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1577427398893" expanded="true" signature="40914:40976" ph="SELECT ISNUL... " />
+            <marker date="1577427398893" expanded="true" signature="41921:42059" ph="UPDATE MF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="42774:42892" ph="UPDATE MF_AR... " />
+            <marker date="1577427398893" expanded="true" signature="43454:43685" ph="INSERT INTO MF_ARP... " />
+            <marker date="1577427398893" expanded="true" signature="44702:44840" ph="UPDATE MF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="45448:45498" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="45708:45819" ph="UPDATE TF_PS... " />
+            <marker date="1577427398893" expanded="true" signature="47274:47331" ph="SELECT ZHANG... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="47551:47620" ph="SELECT ISNUL... MF_ARP" />
+            <marker date="1577427398893" expanded="true" signature="47935:48004" ph="SELECT ISNUL... MF_PSS" />
+            <marker date="1577427398893" expanded="true" signature="48404:48453" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="48513:48562" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="48622:48673" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="52985:53045" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1577427398893" expanded="true" signature="53361:53412" ph="SELECT ISNUL... BACC" />
+            <marker date="1577427398893" expanded="true" signature="53863:54157" ph="INSERT INTO TF_MON... " />
+            <marker date="1577427398893" expanded="true" signature="55629:55909" ph="INSERT INTO TF_MON... " />
+            <marker date="1577427398893" expanded="true" signature="56321:56456" ph="INSERT INTO MF_MON... " />
+            <marker date="1577427398893" expanded="true" signature="56885:57108" ph="INSERT INTO MF_BAC... " />
+            <marker date="1577427398893" expanded="true" signature="57963:58117" ph="INSERT INTO TF_BAC... " />
+            <marker date="1577427398893" expanded="true" signature="62786:62846" ph="SELECT COUNT... MF_VHID" />
+            <marker date="1577427398893" expanded="true" signature="63187:63238" ph="SELECT ISNUL... BACC" />
+            <marker date="1577427398893" expanded="true" signature="63714:63867" ph="UPDATE TF_MO... " />
+            <marker date="1577427398893" expanded="true" signature="64236:64390" ph="UPDATE TF_MO... " />
+            <marker date="1577427398893" expanded="true" signature="64655:64704" ph="UPDATE MF_MO... " />
+            <marker date="1577427398893" expanded="true" signature="64892:64979" ph="UPDATE MF_BA... " />
+            <marker date="1577427398893" expanded="true" signature="65256:65315" ph="UPDATE TF_BA... " />
+            <marker date="1577427398893" expanded="true" signature="66869:66916" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="66990:67038" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="67114:67147" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="67235:67268" ph="DELETE FROM " />
+            <marker date="1577427398893" expanded="true" signature="67788:67867" ph="SELECT table... TABLES" />
+            <marker date="1577427398893" expanded="true" signature="68059:68090" ph="SELECT COUNT... MF_LZ1_Z01" />
+            <marker date="1577427398893" expanded="true" signature="68272:68827" ph="SELECT ISNUL... MF_LZ1_Z01" />
+            <marker date="1577427398893" expanded="true" signature="69637:69682" ph="UPDATE MF_LZ... " />
+            <marker date="1577427398893" expanded="true" signature="70016:70094" ph="SELECT table... TABLES" />
+            <marker date="1577427398893" expanded="true" signature="70286:70316" ph="SELECT COUNT... MF_LZ_Z01" />
+            <marker date="1577427398893" expanded="true" signature="70503:71056" ph="SELECT ISNUL... MF_LZ_Z01" />
+            <marker date="1577427398893" expanded="true" signature="71889:71933" ph="UPDATE MF_LZ... " />
+            <marker date="1577427398893" expanded="true" signature="72661:72739" ph="SELECT table... TABLES" />
+            <marker date="1577427398893" expanded="true" signature="72930:72960" ph="SELECT COUNT... TC_MON_PC" />
+            <marker date="1577427398893" expanded="true" signature="73147:73628" ph="SELECT ISNUL... TC_MON_PC" />
+            <marker date="1577427398893" expanded="true" signature="74215:74259" ph="UPDATE TC_MO... " />
+            <marker date="1577427398893" expanded="true" signature="75024:75102" ph="SELECT table... TABLES" />
+            <marker date="1577427398893" expanded="true" signature="75293:75323" ph="SELECT COUNT... TC_MON_PC" />
+            <marker date="1577427398893" expanded="true" signature="75510:75955" ph="SELECT ISNUL... TC_MON_PC" />
+            <marker date="1577427398893" expanded="true" signature="76562:76606" ph="UPDATE TC_MO... " />
+            <marker date="1577427398893" expanded="true" signature="77370:77448" ph="SELECT table... TABLES" />
+            <marker date="1577427398893" expanded="true" signature="77639:77669" ph="SELECT COUNT... TC_MON_PC" />
+            <marker date="1577427398893" expanded="true" signature="77856:78373" ph="SELECT ISNUL... TC_MON_PC" />
+            <marker date="1577427398893" expanded="true" signature="78980:79024" ph="UPDATE TC_MO... " />
           </folding>
         </state>
       </provider>

Apache24/ABOUT_APACHE.txt

@@ -0,0 +1,244 @@
+
+                     The Apache HTTP Server Project
+
+                        http://httpd.apache.org/
+
+The Apache HTTP Server Project is a collaborative software development effort
+aimed at creating a robust, commercial-grade, featureful, and freely-available
+source code implementation of an HTTP (Web) server. The project is jointly 
+managed by a group of volunteers located around the world, using the Internet
+and the Web to communicate, plan, and develop the server and its related 
+documentation. In addition, hundreds of users have contributed ideas, code, 
+and documentation to the project.
+
+This file is intended to briefly describe the history of the Apache Group (as 
+it was called in the early days), recognize the many contributors, and explain
+how you can join the fun too.
+
+In February of 1995, the most popular server software on the Web was the
+public domain HTTP daemon developed by Rob McCool at the National Center
+for Supercomputing Applications, University of Illinois, Urbana-Champaign.
+However, development of that httpd had stalled after Rob left NCSA in
+mid-1994, and many webmasters had developed their own extensions and bug
+fixes that were in need of a common distribution. A small group of these
+webmasters, contacted via private e-mail, gathered together for the purpose
+of coordinating their changes (in the form of "patches"). Brian Behlendorf
+and Cliff Skolnick put together a mailing list, shared information space,
+and logins for the core developers on a machine in the California Bay Area,
+with bandwidth and diskspace donated by HotWired and Organic Online.
+By the end of February, eight core contributors formed the foundation
+of the original Apache Group:
+
+   Brian Behlendorf        Roy T. Fielding          Rob Hartill
+   David Robinson          Cliff Skolnick           Randy Terbush
+   Robert S. Thau          Andrew Wilson
+
+with additional contributions from
+
+   Eric Hagberg            Frank Peters             Nicolas Pioch
+
+Using NCSA httpd 1.3 as a base, we added all of the published bug fixes
+and worthwhile enhancements we could find, tested the result on our own
+servers, and made the first official public release (0.6.2) of the Apache
+server in April 1995. By coincidence, NCSA restarted their own development
+during the same period, and Brandon Long and Beth Frank of the NCSA Server
+Development Team joined the list in March as honorary members so that the
+two projects could share ideas and fixes.
+
+The early Apache server was a big hit, but we all knew that the codebase
+needed a general overhaul and redesign. During May-June 1995, while
+Rob Hartill and the rest of the group focused on implementing new features
+for 0.7.x (like pre-forked child processes) and supporting the rapidly growing
+Apache user community, Robert Thau designed a new server architecture
+(code-named Shambhala) which included a modular structure and API for better
+extensibility, pool-based memory allocation, and an adaptive pre-forking
+process model. The group switched to this new server base in July and added
+the features from 0.7.x, resulting in Apache 0.8.8 (and its brethren)
+in August.
+
+After extensive beta testing, many ports to obscure platforms, a new set
+of documentation (by David Robinson), and the addition of many features
+in the form of our standard modules, Apache 1.0 was released on
+December 1, 1995.
+
+Less than a year after the group was formed, the Apache server passed
+NCSA's httpd as the #1 server on the Internet.
+
+The survey by Netcraft (http://www.netcraft.com/survey/) shows that Apache
+is today more widely used than all other web servers combined.
+
+ ============================================================================
+
+The current project management committe of the Apache HTTP Server
+project (as of March, 2011) is:
+
+    Aaron Bannert       André Malo              Astrid Stolper
+    Ben Laurie          Bojan Smojver           Brad Nicholes
+    Brian Havard        Brian McCallister       Chris Darroch
+    Chuck Murcko        Colm MacCárthaigh       Dan Poirier
+    Dirk-Willem van Gulik                       Doug MacEachern     
+    Eric Covener        Erik Abele              Graham Dumpleton    
+    Graham Leggett      Greg Ames               Greg Stein 
+    Gregory Trubetskoy  Guenter Knauf           Issac Goldstand     
+    Jeff Trawick        Jim Gallacher           Jim Jagielski      
+    Joe Orton           Joe Schaefer            Joshua Slive
+    Justin Erenkrantz   Ken Coar                Lars Eilebrecht
+    Manoj Kasichainula  Marc Slemko             Mark J. Cox
+    Martin Kraemer      Maxime Petazzoni        Nick Kew
+    Nicolas Lehuen      Noirin Shirley          Paul Querna
+    Philip M. Gollucci  Ralf S. Engelschall     Randy Kobes
+    Rasmus Lerdorf      Rich Bowen              Roy T. Fielding
+    Rüdiger Plüm        Sander Striker          Sander Temm
+    Stefan Fritsch      Tony Stevenson          Victor J. Orlikowski
+    Wilfredo Sanchez    William A. Rowe Jr.     Yoshiki Hayashi     
+
+Other major contributors
+
+   Howard Fear (mod_include), Florent Guillaume (language negotiation),
+   Koen Holtman (rewrite of mod_negotiation),
+   Kevin Hughes (creator of all those nifty icons),
+   Brandon Long and Beth Frank (NCSA Server Development Team, post-1.3),
+   Ambarish Malpani (Beginning of the NT port),
+   Rob McCool (original author of the NCSA httpd 1.3),
+   Paul Richards (convinced the group to use remote CVS after 1.0),
+   Garey Smiley (OS/2 port), Henry Spencer (author of the regex library).
+
+Many 3rd-party modules, frequently used and recommended, are also
+freely-available and linked from the related projects page:
+<http://modules.apache.org/>, and their authors frequently
+contribute ideas, patches, and testing.
+
+Hundreds of people have made individual contributions to the Apache
+project. Patch contributors are listed in the CHANGES file.
+
+ ============================================================================
+
+How to become involved in the Apache project
+
+There are several levels of contributing. If you just want to send
+in an occasional suggestion/fix, then you can just use the bug reporting
+form at <http://httpd.apache.org/bug_report.html>. You can also subscribe
+to the announcements mailing list (announce-subscribe@httpd.apache.org) which
+we use to broadcast information about new releases, bugfixes, and upcoming
+events. There's a lot of information about the development process (much of
+it in serious need of updating) to be found at <http://httpd.apache.org/dev/>.
+
+If you'd like to become an active contributor to the Apache project (the
+group of volunteers who vote on changes to the distributed server), then
+you need to start by subscribing to the dev@httpd.apache.org mailing list.
+One warning though: traffic is high, 1000 to 1500 messages/month.
+To subscribe to the list, send an email to dev-subscribe@httpd.apache.org.
+We recommend reading the list for a while before trying to jump in to 
+development.
+
+   NOTE: The developer mailing list (dev@httpd.apache.org) is not
+   a user support forum; it is for people actively working on development
+   of the server code and documentation, and for planning future
+   directions. If you have user/configuration questions, send them
+   to users list <http://httpd.apache.org/userslist> or to the USENET
+   newsgroup "comp.infosystems.www.servers.unix".or for windows users,
+   the newsgroup "comp.infosystems.www.servers.ms-windows".
+
+There is a core group of contributors (informally called the "core")
+which was formed from the project founders and is augmented from time
+to time when core members nominate outstanding contributors and the
+rest of the core members agree. The core group focus is more on
+"business" issues and limited-circulation things like security problems
+than on mainstream code development. The term "The Apache Group"
+technically refers to this core of project contributors.
+
+The Apache project is a meritocracy--the more work you have done, the more
+you are allowed to do. The group founders set the original rules, but
+they can be changed by vote of the active members. There is a group
+of people who have logins on our server (apache.org) and access to the
+svn repository.  Everyone has access to the svn snapshots.  Changes to
+the code are proposed on the mailing list and usually voted on by active
+members--three +1 (yes votes) and no -1 (no votes, or vetoes) are needed
+to commit a code change during a release cycle; docs are usually committed
+first and then changed as needed, with conflicts resolved by majority vote.
+
+Our primary method of communication is our mailing list. Approximately 40
+messages a day flow over the list, and are typically very conversational in
+tone. We discuss new features to add, bug fixes, user problems, developments
+in the web server community, release dates, etc. The actual code development
+takes place on the developers' local machines, with proposed changes
+communicated using a patch (output of a unified "diff -u oldfile newfile"
+command), and committed to the source repository by one of the core
+developers using remote svn.  Anyone on the mailing list can vote on a
+particular issue, but we only count those made by active members or people
+who are known to be experts on that part of the server. Vetoes must be
+accompanied by a convincing explanation.
+
+New members of the Apache Group are added when a frequent contributor is
+nominated by one member and unanimously approved by the voting members.
+In most cases, this "new" member has been actively contributing to the
+group's work for over six months, so it's usually an easy decision.
+
+The above describes our past and current (as of July 2000) guidelines,
+which will probably change over time as the membership of the group
+changes and our development/coordination tools improve.
+
+ ============================================================================
+
+The Apache Software Foundation (www.apache.org)
+
+The Apache Software Foundation exists to provide organizational, legal,
+and financial support for the Apache open-source software projects.
+Founded in June 1999 by the Apache Group, the Foundation has been
+incorporated as a membership-based, not-for-profit corporation in order
+to ensure that the Apache projects continue to exist beyond the participation
+of individual volunteers, to enable contributions of intellectual property
+and funds on a sound basis, and to provide a vehicle for limiting legal
+exposure while participating in open-source software projects. 
+
+You are invited to participate in The Apache Software Foundation. We welcome
+contributions in many forms. Our membership consists of those individuals
+who have demonstrated a commitment to collaborative open-source software
+development through sustained participation and contributions within the
+Foundation's projects. Many people and companies have contributed towards
+the success of the Apache projects. 
+
+ ============================================================================
+
+Why The Apache HTTP Server Is Free
+
+Apache HTTP Server exists to provide a robust and commercial-grade reference
+implementation of the HTTP protocol. It must remain a platform upon which
+individuals and institutions can build reliable systems, both for
+experimental purposes and for mission-critical purposes. We believe the
+tools of online publishing should be in the hands of everyone, and
+software companies should make their money providing value-added services
+such as specialized modules and support, amongst other things. We realize
+that it is often seen as an economic advantage for one company to "own" a
+market - in the software industry that means to control tightly a
+particular conduit such that all others must pay. This is typically done
+by "owning" the protocols through which companies conduct business, at the
+expense of all those other companies. To the extent that the protocols of
+the World Wide Web remain "unowned" by a single company, the Web will
+remain a level playing field for companies large and small. Thus,
+"ownership" of the protocol must be prevented, and the existence of a
+robust reference implementation of the protocol, available absolutely for
+free to all companies, is a tremendously good thing. 
+
+Furthermore, Apache httpd is an organic entity; those who benefit from it
+by using it often contribute back to it by providing feature enhancements,
+bug fixes, and support for others in public newsgroups. The amount of
+effort expended by any particular individual is usually fairly light, but
+the resulting product is made very strong. This kind of community can
+only happen with freeware--when someone pays for software, they usually
+aren't willing to fix its bugs. One can argue, then, that Apache's
+strength comes from the fact that it's free, and if it were made "not
+free" it would suffer tremendously, even if that money were spent on a
+real development team.
+
+We want to see Apache httpd used very widely--by large companies, small
+companies, research institutions, schools, individuals, in the intranet
+environment, everywhere--even though this may mean that companies who
+could afford commercial software, and would pay for it without blinking,
+might get a "free ride" by using Apache httpd. We would even be happy if 
+some commercial software companies completely dropped their own HTTP server
+development plans and used Apache httpd as a base, with the proper attributions
+as described in the LICENSE file.
+
+Thanks for using Apache HTTP Server!
+

Apache24/CHANGES.txt

@@ -0,0 +1,3 @@
+
+
+See :  https://www.apachelounge.com/Changelog-2.4.html 

Apache24/INSTALL.txt

@@ -0,0 +1,87 @@
+
+  APACHE INSTALLATION OVERVIEW
+
+  Quick Start - Unix
+  ------------------
+
+  For complete installation documentation, see [ht]docs/manual/install.html or
+  http://httpd.apache.org/docs/2.4/install.html
+
+     $ ./configure --prefix=PREFIX
+     $ make
+     $ make install
+     $ PREFIX/bin/apachectl start
+
+     NOTES: * Replace PREFIX with the filesystem path under which 
+              Apache should be installed.  A typical installation
+              might use "/usr/local/apache2" for PREFIX (without the
+              quotes).
+
+            * Consider if you want to use a previously installed APR and
+              APR-Util (such as those provided with many OSes) or if you
+              need to use the APR and APR-Util from the apr.apache.org
+              project. If the latter, download the latest versions and
+              unpack them to ./srclib/apr and ./srclib/apr-util (no
+              version numbers in the directory names) and use
+              ./configure's --with-included-apr option. This is required
+              if you don't have the compiler which the system APR was
+              built with.  It can also be advantageous if you are a
+              developer who will be linking your code with Apache or using
+              a debugger to step through server code, as it removes the
+              possibility of version or compile-option mismatches with APR
+              and APR-Util code. As a convenience, prepackaged source-code
+              bundles of APR and APR-Util are occasionally also provided
+              as a httpd-2.X.X-deps.tar.gz download.
+
+            * If you are a developer building Apache directly from
+              Subversion, you will need to run ./buildconf before running
+              configure. This script bootstraps the build environment and
+              requires Python as well as GNU autoconf and libtool. If you
+              build Apache from a release tarball, you don't have to run
+              buildconf.
+
+            * If you want to build a threaded MPM (for instance worker)
+              on  FreeBSD, be aware that threads do not work well with
+              Apache on FreeBSD versions before 5.4-RELEASE. If you wish
+              to try a threaded Apache on an earlier version of FreeBSD,
+              use the --enable-threads parameter to ./configure in
+              addition to the --with-mpm parameter.
+
+            * If you are building directly from Subversion on Mac OS X
+              (Darwin), make sure to use GNU Libtool 1.4.2 or newer. All
+              recent versions of the developer tools on this platform
+              include a sufficiently recent version of GNU Libtool (named
+              glibtool, but buildconf knows where to find it).
+
+  For a short impression of what possibilities you have, here is a
+  typical example which configures Apache for the installation tree
+  /sw/pkg/apache with a particular compiler and flags plus the two
+  additional modules mod_rewrite and mod_speling for later loading
+  through the DSO mechanism:
+
+     $ CC="pgcc" CFLAGS="-O2" \
+     ./configure --prefix=/sw/pkg/apache \
+     --enable-rewrite=shared \
+     --enable-speling=shared 
+
+  The easiest way to find all of the configuration flags for Apache 2.4
+  is to run ./configure --help.
+
+
+  Quick Start - Windows
+  ---------------------
+
+  For complete documentation, see manual/platform/windows.html.en or
+  <http://httpd.apache.org/docs/2.4/platform/windows.html>
+
+
+  Postscript
+  ----------
+
+  To obtain help with installation problems, please see the resources at
+  <http://httpd.apache.org/support.html>
+
+  Thanks for using the Apache HTTP Server, version 2.4.
+
+                                     The Apache Software Foundation
+                                     http://www.apache.org/

Apache24/LICENSE.txt

@@ -0,0 +1,946 @@
+                                  Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+APACHE HTTP SERVER SUBCOMPONENTS: 
+
+The Apache HTTP Server includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+For the mod_mime_magic component:
+
+/*
+ * mod_mime_magic: MIME type lookup via file magic numbers
+ * Copyright (c) 1996-1997 Cisco Systems, Inc.
+ *
+ * This software was submitted by Cisco Systems to the Apache Group in July
+ * 1997.  Future revisions and derivatives of this source code must
+ * acknowledge Cisco Systems as the original contributor of this module.
+ * All other licensing and usage conditions are those of the Apache Group.
+ *
+ * Some of this code is derived from the free version of the file command
+ * originally posted to comp.sources.unix.  Copyright info for that program
+ * is included below as required.
+ * ---------------------------------------------------------------------------
+ * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone and
+ * Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on any
+ * computer system, and to alter it and redistribute it freely, subject to
+ * the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ * software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ * explicit claim or by omission.  Since few users ever read sources, credits
+ * must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.  Since few users ever read
+ * sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
+ * -------------------------------------------------------------------------
+ *
+ */
+
+
+For the  modules\mappers\mod_imagemap.c component:
+
+  "macmartinized" polygon code copyright 1992 by Eric Haines, erich@eye.com
+
+For the  server\util_md5.c component:
+
+/************************************************************************
+ * NCSA HTTPd Server
+ * Software Development Group
+ * National Center for Supercomputing Applications
+ * University of Illinois at Urbana-Champaign
+ * 605 E. Springfield, Champaign, IL 61820
+ * httpd@ncsa.uiuc.edu
+ *
+ * Copyright  (C)  1995, Board of Trustees of the University of Illinois
+ *
+ ************************************************************************
+ *
+ * md5.c: NCSA HTTPd code which uses the md5c.c RSA Code
+ *
+ *  Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc.
+ *  Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon
+ *     University (see Copyright below).
+ *  Portions of Content-MD5 code Copyright (C) 1991 Bell Communications 
+ *     Research, Inc. (Bellcore) (see Copyright below).
+ *  Portions extracted from mpack, John G. Myers - jgm+@cmu.edu
+ *  Content-MD5 Code contributed by Martin Hamilton (martin@net.lut.ac.uk)
+ *
+ */
+
+
+/* these portions extracted from mpack, John G. Myers - jgm+@cmu.edu */
+/* (C) Copyright 1993,1994 by Carnegie Mellon University
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Carnegie
+ * Mellon University not be used in advertising or publicity
+ * pertaining to distribution of the software without specific,
+ * written prior permission.  Carnegie Mellon University makes no
+ * representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+/*
+ * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ *
+ * Permission to use, copy, modify, and distribute this material
+ * for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice and this permission notice
+ * appear in all copies, and that the name of Bellcore not be
+ * used in advertising or publicity pertaining to this
+ * material without the specific, prior written permission
+ * of an authorized representative of Bellcore.  BELLCORE
+ * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+ * OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.  
+ */
+
+
+For the util_pcre.c and ap_regex.h components:
+
+           Copyright (c) 1997-2004 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+
+
+For the  srclib\apr\include\apr_md5.h component: 
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+   rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD5 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+ */
+
+For the  srclib\apr\passwd\apr_md5.c component:
+
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+   rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD5 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+ */
+/*
+ * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
+ * MD5 crypt() function, which is licenced as follows:
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
+ * ----------------------------------------------------------------------------
+ */
+
+For the srclib\apr-util\crypto\apr_md4.c component:
+
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the srclib\apr-util\include\apr_md4.h component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+
+For the srclib\apr-util\test\testmd4.c component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+ * rights reserved.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the test\zb.c component:
+
+/*                          ZeusBench V1.01
+			    ===============
+
+This program is Copyright (C) Zeus Technology Limited 1996.
+
+This program may be used and copied freely providing this copyright notice
+is not removed.
+
+This software is provided "as is" and any express or implied waranties, 
+including but not limited to, the implied warranties of merchantability and
+fitness for a particular purpose are disclaimed.  In no event shall 
+Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, 
+exemplary, or consequential damaged (including, but not limited to, 
+procurement of substitute good or services; loss of use, data, or profits;
+or business interruption) however caused and on theory of liability.  Whether
+in contract, strict liability or tort (including negligence or otherwise) 
+arising in any way out of the use of this software, even if advised of the
+possibility of such damage.
+
+     Written by Adam Twiss (adam@zeus.co.uk).  March 1996
+
+Thanks to the following people for their input:
+  Mike Belshe (mbelshe@netscape.com) 
+  Michael Campanella (campanella@stevms.enet.dec.com)
+
+*/
+
+
+For the pcre.dll component:
+
+PCRE LICENCE
+------------
+
+PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+Release 8 of PCRE is distributed under the terms of the "BSD" licence, as
+specified below. The documentation for PCRE, supplied in the "doc"
+directory, is distributed under the same terms as the software itself. The data
+in the testdata directory is not copyrighted and is in the public domain.
+
+The basic library functions are written in C and are freestanding. Also
+included in the distribution is a set of C++ wrapper functions, and a
+just-in-time compiler that can be used to optimize pattern matching. These
+are both optional features that can be omitted when the library is built.
+
+
+THE BASIC LIBRARY FUNCTIONS
+---------------------------
+
+Written by:       Philip Hazel
+Email local part: ph10
+Email domain:     cam.ac.uk
+
+University of Cambridge Computing Service,
+Cambridge, England.
+
+Copyright (c) 1997-2019 University of Cambridge
+All rights reserved.
+
+
+PCRE JUST-IN-TIME COMPILATION SUPPORT
+-------------------------------------
+
+Written by:       Zoltan Herczeg
+Email local part: hzmester
+Emain domain:     freemail.hu
+
+Copyright(c) 2010-2019 Zoltan Herczeg
+All rights reserved.
+
+
+STACK-LESS JUST-IN-TIME COMPILER
+--------------------------------
+
+Written by:       Zoltan Herczeg
+Email local part: hzmester
+Emain domain:     freemail.hu
+
+Copyright(c) 2009-2019 Zoltan Herczeg
+All rights reserved.
+
+
+THE C++ WRAPPER FUNCTIONS
+-------------------------
+
+Contributed by:   Google Inc.
+
+Copyright (c) 2007-2012, Google Inc.
+All rights reserved.
+
+
+THE "BSD" LICENCE
+-----------------
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the name of Google
+      Inc. nor the names of their contributors may be used to endorse or
+      promote products derived from this software without specific prior
+      written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+END OF PCRE LICENSE
+
+For the libeay32.dll, ssleay32.dll and openssl.exe components:
+
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a double license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact openssl-core@openssl.org.
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+
+For the mod_deflate zlib compression component:
+
+ (C) 1995-2019 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+For the mod_lua language component:
+
+Lua License
+-----------
+
+Lua is licensed under the terms of the MIT license reproduced below.
+This means that Lua is free software and can be used for both academic
+and commercial purposes at absolutely no cost.
+
+For details and rationale, see http://www.lua.org/license.html .
+
+===============================================================================
+
+Copyright (C) 1994-2012 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
+
+
+For the mod_proxy_html and mod_xml2enc libxml2 C library components:
+
+Except where otherwise noted in the source code (e.g. the files hash.c,
+list.c and the trio files, which are covered by a similar licence but
+with different Copyright notices) all the files are:
+
+ Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For the mod_http2 nghttp2 C library component:
+
+The MIT License
+
+Copyright (c) 2012-2019 Tatsuhiro Tsujikawa
+Copyright (c) 2012-2019 nghttp2 contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the mod_brotli Brotli C library component:
+
+Copyright (c) 2009-2019 by the Brotli Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For the mod_md  Curl C library component:
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2019, Daniel Stenberg, <daniel@haxx.se>, and many
+contributors.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+
+For the mod_md Jansson C library component:
+
+Copyright (c) 2009-2019 Petri Lehtinen <petri@digip.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+

Apache24/NOTICE.txt

@@ -0,0 +1,60 @@
+Apache HTTP Server
+Copyright 2019 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at the National Center
+for Supercomputing Applications (NCSA) at the University of
+Illinois at Urbana-Champaign.
+
+This software contains code derived from the RSA Data Security
+Inc. MD5 Message-Digest Algorithm, including various
+modifications by Spyglass Inc., Carnegie Mellon University, and
+Bell Communications Research, Inc (Bellcore).
+
+This software contains code derived from the PCRE library pcreposix.c
+source code, written by Philip Hazel, Copyright 1997-2004
+by the University of Cambridge, England.
+
+Regular expression support is provided by the PCRE library package,
+which is open source software, written by Philip Hazel, and copyright
+by the University of Cambridge, England. The original software is
+available from
+  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+
+This binary distribution includes cryptographic software written by
+Eric Young (eay@cryptsoft.com), software written by Tim Hudson 
+(tjh@cryptsoft.com), and software developed by the OpenSSL Project 
+for use in the OpenSSL Toolkit <http://www.openssl.org/>.
+
+This binary distribution of mod_deflate.so includes zlib compression code
+<http://www.gzip.org/zlib/> written by Jean-loup Gailly (jloup@gzip.org)
+and Mark Adler (madler@alumni.caltech.edu) .
+
+This binary distribution of mod_lua.so includes the Lua language, 
+developed at Lua.org, a laboratory of the Department of Computer Science 
+of PUC-Rio (the Pontifical Catholic University of Rio de Janeiro in Brazil).
+For complete information, visit Lua's web site at http://www.lua.org/
+
+This binary distributions of mod_proxy_html.so and mod_xml2enc.so include the
+libxml2 C library written by Daniel Veillard (daniel veillard.com), Bjorn 
+Reese (breese users.sourceforge.net) and Gary Pennington (Gary.Pennington 
+uk.sun.com). For complete information, visit LibXML2's web site at 
+https://http://www.xmlsoft.org/
+
+This binary distribution of mod_http2.so includes nghttp2 C library written 
+by Tatsuhiro Tsujikawa. For complete information, visit nghttp2's web site 
+at https://nghttp2.org/
+
+This binary distribution of mod_brotli.so includes Brotli C library written 
+by the Brotli Authors. For complete information, visit Brotli's web site 
+at https://github.com/google/brotli
+
+This binary distribution of mod_md.so includes Curl C library written by 
+Daniel Stenberg and many contributors. For complete information, 
+visit curl's web site at https://curl.haxx.se/
+
+This binary distribution of mod_md.so includes Jansson C library written 
+by the  Petri Lehtinen. For complete information, visit Jansson's web site 
+at http://www.digip.org/jansson/

Apache24/OPENSSL-NEWS.txt

@@ -0,0 +1,952 @@
+
+ Apache HTTP Server 2.4 Limited OpenSSL Distribution
+
+ This binary distribution includes the minimal components of OpenSSL required
+ to support mod_ssl for Apache HTTP Server version 2.4 (details are listed 
+ in OPENSSL-README.txt.)  For the complete list of CHANGES to this and later 
+ versions of OpenSSL, please refer to the definative source,
+ <http://www.openssl.org/news/changelog.html>, or see the CHANGES file in the
+ full binary or source distribution package from <http://www.openssl.org/>.
+
+ These OpenSSL binaries were built for distribution from the U.S. without 
+ support for the patented encryption methods IDEA, MDC-2 or RC5.
+
+--------------------------------------------------------------------------------
+
+
+  NEWS
+  ====
+
+  This file gives a brief overview of the major changes between each OpenSSL
+  release. For more details please read the CHANGES file.
+
+  Major changes between OpenSSL 1.1.1b and OpenSSL 1.1.1c [28 May 2019]
+
+      o Prevent over long nonces in ChaCha20-Poly1305 (CVE-2019-1543)
+
+  Major changes between OpenSSL 1.1.1a and OpenSSL 1.1.1b [26 Feb 2019]
+
+      o Change the info callback signals for the start and end of a post-handshake
+        message exchange in TLSv1.3.
+      o Fix a bug in DTLS over SCTP. This breaks interoperability with older versions
+        of OpenSSL like OpenSSL 1.1.0 and OpenSSL 1.0.2.
+
+  Major changes between OpenSSL 1.1.1 and OpenSSL 1.1.1a [20 Nov 2018]
+
+      o Timing vulnerability in DSA signature generation (CVE-2018-0734)
+      o Timing vulnerability in ECDSA signature generation (CVE-2018-0735)
+
+  Major changes between OpenSSL 1.1.0i and OpenSSL 1.1.1 [11 Sep 2018]
+
+      o Support for TLSv1.3 added (see https://wiki.openssl.org/index.php/TLS1.3
+        for further important information). The TLSv1.3 implementation includes:
+          o Fully compliant implementation of RFC8446 (TLSv1.3) on by default
+          o Early data (0-RTT)
+          o Post-handshake authentication and key update
+          o Middlebox Compatibility Mode
+          o TLSv1.3 PSKs
+          o Support for all five RFC8446 ciphersuites
+          o RSA-PSS signature algorithms (backported to TLSv1.2)
+          o Configurable session ticket support
+          o Stateless server support
+          o Rewrite of the packet construction code for "safer" packet handling
+          o Rewrite of the extension handling code
+      o Complete rewrite of the OpenSSL random number generator to introduce the
+        following capabilities
+          o The default RAND method now utilizes an AES-CTR DRBG according to
+            NIST standard SP 800-90Ar1.
+          o Support for multiple DRBG instances with seed chaining.
+          o There is a public and private DRBG instance.
+          o The DRBG instances are fork-safe.
+          o Keep all global DRBG instances on the secure heap if it is enabled.
+          o The public and private DRBG instance are per thread for lock free
+            operation
+      o Support for various new cryptographic algorithms including:
+          o SHA3
+          o SHA512/224 and SHA512/256
+          o EdDSA (both Ed25519 and Ed448) including X509 and TLS support
+          o X448 (adding to the existing X25519 support in 1.1.0)
+          o Multi-prime RSA
+          o SM2
+          o SM3
+          o SM4
+          o SipHash
+          o ARIA (including TLS support)
+      o Significant Side-Channel attack security improvements
+      o Add a new ClientHello callback to provide the ability to adjust the SSL
+        object at an early stage.
+      o Add 'Maximum Fragment Length' TLS extension negotiation and support
+      o A new STORE module, which implements a uniform and URI based reader of
+        stores that can contain keys, certificates, CRLs and numerous other
+        objects.
+      o Move the display of configuration data to configdata.pm.
+      o Allow GNU style "make variables" to be used with Configure.
+      o Claim the namespaces OSSL and OPENSSL, represented as symbol prefixes
+      o Rewrite of devcrypto engine
+
+  Major changes between OpenSSL 1.1.0h and OpenSSL 1.1.0i [under development]
+
+      o Client DoS due to large DH parameter (CVE-2018-0732)
+      o Cache timing vulnerability in RSA Key Generation (CVE-2018-0737)
+
+  Major changes between OpenSSL 1.1.0g and OpenSSL 1.1.0h [under development]
+
+      o Constructed ASN.1 types with a recursive definition could exceed the
+        stack (CVE-2018-0739)
+      o Incorrect CRYPTO_memcmp on HP-UX PA-RISC (CVE-2018-0733)
+      o rsaz_1024_mul_avx2 overflow bug on x86_64 (CVE-2017-3738)
+
+  Major changes between OpenSSL 1.1.0f and OpenSSL 1.1.0g [2 Nov 2017]
+
+      o bn_sqrx8x_internal carry bug on x86_64 (CVE-2017-3736)
+      o Malformed X.509 IPAddressFamily could cause OOB read (CVE-2017-3735)
+
+  Major changes between OpenSSL 1.1.0e and OpenSSL 1.1.0f [25 May 2017]
+
+      o config now recognises 64-bit mingw and chooses mingw64 instead of mingw
+
+  Major changes between OpenSSL 1.1.0d and OpenSSL 1.1.0e [16 Feb 2017]
+
+      o Encrypt-Then-Mac renegotiation crash (CVE-2017-3733)
+
+  Major changes between OpenSSL 1.1.0c and OpenSSL 1.1.0d [26 Jan 2017]
+
+      o Truncated packet could crash via OOB read (CVE-2017-3731)
+      o Bad (EC)DHE parameters cause a client crash (CVE-2017-3730)
+      o BN_mod_exp may produce incorrect results on x86_64 (CVE-2017-3732)
+
+  Major changes between OpenSSL 1.1.0b and OpenSSL 1.1.0c [10 Nov 2016]
+
+      o ChaCha20/Poly1305 heap-buffer-overflow (CVE-2016-7054)
+      o CMS Null dereference (CVE-2016-7053)
+      o Montgomery multiplication may produce incorrect results (CVE-2016-7055)
+
+  Major changes between OpenSSL 1.1.0a and OpenSSL 1.1.0b [26 Sep 2016]
+
+      o Fix Use After Free for large message sizes (CVE-2016-6309)
+
+  Major changes between OpenSSL 1.1.0 and OpenSSL 1.1.0a [22 Sep 2016]
+
+      o OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
+      o SSL_peek() hang on empty record (CVE-2016-6305)
+      o Excessive allocation of memory in tls_get_message_header()
+       (CVE-2016-6307)
+      o Excessive allocation of memory in dtls1_preprocess_fragment()
+       (CVE-2016-6308)
+
+  Major changes between OpenSSL 1.0.2h and OpenSSL 1.1.0 [25 Aug 2016]
+
+      o Copyright text was shrunk to a boilerplate that points to the license
+      o "shared" builds are now the default when possible
+      o Added support for "pipelining"
+      o Added the AFALG engine
+      o New threading API implemented
+      o Support for ChaCha20 and Poly1305 added to libcrypto and libssl
+      o Support for extended master secret
+      o CCM ciphersuites
+      o Reworked test suite, now based on perl, Test::Harness and Test::More
+      o *Most* libcrypto and libssl public structures were made opaque,
+        including:
+        BIGNUM and associated types, EC_KEY and EC_KEY_METHOD,
+        DH and DH_METHOD, DSA and DSA_METHOD, RSA and RSA_METHOD,
+        BIO and BIO_METHOD, EVP_MD_CTX, EVP_MD, EVP_CIPHER_CTX,
+        EVP_CIPHER, EVP_PKEY and associated types, HMAC_CTX,
+        X509, X509_CRL, X509_OBJECT, X509_STORE_CTX, X509_STORE,
+        X509_LOOKUP, X509_LOOKUP_METHOD
+      o libssl internal structures made opaque
+      o SSLv2 support removed
+      o Kerberos ciphersuite support removed
+      o RC4 removed from DEFAULT ciphersuites in libssl
+      o 40 and 56 bit cipher support removed from libssl
+      o All public header files moved to include/openssl, no more symlinking
+      o SSL/TLS state machine, version negotiation and record layer rewritten
+      o EC revision: now operations use new EC_KEY_METHOD.
+      o Support for OCB mode added to libcrypto
+      o Support for asynchronous crypto operations added to libcrypto and libssl
+      o Deprecated interfaces can now be disabled at build time either
+        relative to the latest release via the "no-deprecated" Configure
+        argument, or via the "--api=1.1.0|1.0.0|0.9.8" option.
+      o Application software can be compiled with -DOPENSSL_API_COMPAT=version
+        to ensure that features deprecated in that version are not exposed.
+      o Support for RFC6698/RFC7671 DANE TLSA peer authentication
+      o Change of Configure to use --prefix as the main installation
+        directory location rather than --openssldir.  The latter becomes
+        the directory for certs, private key and openssl.cnf exclusively.
+      o Reworked BIO networking library, with full support for IPv6.
+      o New "unified" build system
+      o New security levels
+      o Support for scrypt algorithm
+      o Support for X25519
+      o Extended SSL_CONF support using configuration files
+      o KDF algorithm support. Implement TLS PRF as a KDF.
+      o Support for Certificate Transparency
+      o HKDF support.
+
+  Major changes between OpenSSL 1.0.2g and OpenSSL 1.0.2h [3 May 2016]
+
+      o Prevent padding oracle in AES-NI CBC MAC check (CVE-2016-2107)
+      o Fix EVP_EncodeUpdate overflow (CVE-2016-2105)
+      o Fix EVP_EncryptUpdate overflow (CVE-2016-2106)
+      o Prevent ASN.1 BIO excessive memory allocation (CVE-2016-2109)
+      o EBCDIC overread (CVE-2016-2176)
+      o Modify behavior of ALPN to invoke callback after SNI/servername
+        callback, such that updates to the SSL_CTX affect ALPN.
+      o Remove LOW from the DEFAULT cipher list.  This removes singles DES from
+        the default.
+      o Only remove the SSLv2 methods with the no-ssl2-method option.
+
+  Major changes between OpenSSL 1.0.2f and OpenSSL 1.0.2g [1 Mar 2016]
+
+      o Disable weak ciphers in SSLv3 and up in default builds of OpenSSL.
+      o Disable SSLv2 default build, default negotiation and weak ciphers
+        (CVE-2016-0800)
+      o Fix a double-free in DSA code (CVE-2016-0705)
+      o Disable SRP fake user seed to address a server memory leak
+        (CVE-2016-0798)
+      o Fix BN_hex2bn/BN_dec2bn NULL pointer deref/heap corruption
+        (CVE-2016-0797)
+      o Fix memory issues in BIO_*printf functions (CVE-2016-0799)
+      o Fix side channel attack on modular exponentiation (CVE-2016-0702)
+
+  Major changes between OpenSSL 1.0.2e and OpenSSL 1.0.2f [28 Jan 2016]
+
+      o DH small subgroups (CVE-2016-0701)
+      o SSLv2 doesn't block disabled ciphers (CVE-2015-3197)
+
+  Major changes between OpenSSL 1.0.2d and OpenSSL 1.0.2e [3 Dec 2015]
+
+      o BN_mod_exp may produce incorrect results on x86_64 (CVE-2015-3193)
+      o Certificate verify crash with missing PSS parameter (CVE-2015-3194)
+      o X509_ATTRIBUTE memory leak (CVE-2015-3195)
+      o Rewrite EVP_DecodeUpdate (base64 decoding) to fix several bugs
+      o In DSA_generate_parameters_ex, if the provided seed is too short,
+        return an error
+
+  Major changes between OpenSSL 1.0.2c and OpenSSL 1.0.2d [9 Jul 2015]
+
+      o Alternate chains certificate forgery (CVE-2015-1793)
+      o Race condition handling PSK identify hint (CVE-2015-3196)
+
+  Major changes between OpenSSL 1.0.2b and OpenSSL 1.0.2c [12 Jun 2015]
+
+      o Fix HMAC ABI incompatibility
+
+  Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [11 Jun 2015]
+
+      o Malformed ECParameters causes infinite loop (CVE-2015-1788)
+      o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
+      o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
+      o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
+      o Race condition handling NewSessionTicket (CVE-2015-1791)
+
+  Major changes between OpenSSL 1.0.2 and OpenSSL 1.0.2a [19 Mar 2015]
+
+      o OpenSSL 1.0.2 ClientHello sigalgs DoS fix (CVE-2015-0291)
+      o Multiblock corrupted pointer fix (CVE-2015-0290)
+      o Segmentation fault in DTLSv1_listen fix (CVE-2015-0207)
+      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
+      o Segmentation fault for invalid PSS parameters fix (CVE-2015-0208)
+      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
+      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
+      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
+      o Empty CKE with client auth and DHE fix (CVE-2015-1787)
+      o Handshake with unseeded PRNG fix (CVE-2015-0285)
+      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
+      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
+      o Removed the export ciphers from the DEFAULT ciphers
+
+  Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.2 [22 Jan 2015]:
+
+      o Suite B support for TLS 1.2 and DTLS 1.2
+      o Support for DTLS 1.2
+      o TLS automatic EC curve selection.
+      o API to set TLS supported signature algorithms and curves
+      o SSL_CONF configuration API.
+      o TLS Brainpool support.
+      o ALPN support.
+      o CMS support for RSA-PSS, RSA-OAEP, ECDH and X9.42 DH.
+
+  Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015]
+
+      o Build fixes for the Windows and OpenVMS platforms
+
+  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015]
+
+      o Fix for CVE-2014-3571
+      o Fix for CVE-2015-0206
+      o Fix for CVE-2014-3569
+      o Fix for CVE-2014-3572
+      o Fix for CVE-2015-0204
+      o Fix for CVE-2015-0205
+      o Fix for CVE-2014-8275
+      o Fix for CVE-2014-3570
+
+  Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014]
+
+      o Fix for CVE-2014-3513
+      o Fix for CVE-2014-3567
+      o Mitigation for CVE-2014-3566 (SSL protocol vulnerability)
+      o Fix for CVE-2014-3568
+
+  Major changes between OpenSSL 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014]
+
+      o Fix for CVE-2014-3512
+      o Fix for CVE-2014-3511
+      o Fix for CVE-2014-3510
+      o Fix for CVE-2014-3507
+      o Fix for CVE-2014-3506
+      o Fix for CVE-2014-3505
+      o Fix for CVE-2014-3509
+      o Fix for CVE-2014-5139
+      o Fix for CVE-2014-3508
+
+  Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014]
+
+      o Fix for CVE-2014-0224
+      o Fix for CVE-2014-0221
+      o Fix for CVE-2014-0198
+      o Fix for CVE-2014-0195
+      o Fix for CVE-2014-3470
+      o Fix for CVE-2010-5298
+
+  Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014]
+
+      o Fix for CVE-2014-0160
+      o Add TLS padding extension workaround for broken servers.
+      o Fix for CVE-2014-0076
+
+  Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [6 Jan 2014]
+
+      o Don't include gmt_unix_time in TLS server and client random values
+      o Fix for TLS record tampering bug CVE-2013-4353
+      o Fix for TLS version checking bug CVE-2013-6449
+      o Fix for DTLS retransmission bug CVE-2013-6450
+
+  Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e [11 Feb 2013]:
+
+      o Corrected fix for CVE-2013-0169
+
+  Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d [4 Feb 2013]:
+
+      o Fix renegotiation in TLS 1.1, 1.2 by using the correct TLS version.
+      o Include the fips configuration module.
+      o Fix OCSP bad key DoS attack CVE-2013-0166
+      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
+      o Fix for TLS AESNI record handling flaw CVE-2012-2686
+
+  Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c [10 May 2012]:
+
+      o Fix TLS/DTLS record length checking bug CVE-2012-2333
+      o Don't attempt to use non-FIPS composite ciphers in FIPS mode.
+
+  Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b [26 Apr 2012]:
+
+      o Fix compilation error on non-x86 platforms.
+      o Make FIPS capable OpenSSL ciphers work in non-FIPS mode.
+      o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0
+
+  Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a [19 Apr 2012]:
+
+      o Fix for ASN1 overflow bug CVE-2012-2110
+      o Workarounds for some servers that hang on long client hellos.
+      o Fix SEGV in AES code.
+
+  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1 [14 Mar 2012]:
+
+      o TLS/DTLS heartbeat support.
+      o SCTP support.
+      o RFC 5705 TLS key material exporter.
+      o RFC 5764 DTLS-SRTP negotiation.
+      o Next Protocol Negotiation.
+      o PSS signatures in certificates, requests and CRLs.
+      o Support for password based recipient info for CMS.
+      o Support TLS v1.2 and TLS v1.1.
+      o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
+      o SRP support.
+
+  Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]:
+
+      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
+      o Corrected fix for CVE-2011-4619
+      o Various DTLS fixes.
+
+  Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g [18 Jan 2012]:
+
+      o Fix for DTLS DoS issue CVE-2012-0050
+
+  Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f [4 Jan 2012]:
+
+      o Fix for DTLS plaintext recovery attack CVE-2011-4108
+      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
+      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
+      o Check parameters are not NULL in GOST ENGINE CVE-2012-0027
+      o Check for malformed RFC3779 data CVE-2011-4577
+
+  Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e [6 Sep 2011]:
+
+      o Fix for CRL vulnerability issue CVE-2011-3207
+      o Fix for ECDH crashes CVE-2011-3210
+      o Protection against EC timing attacks.
+      o Support ECDH ciphersuites for certificates using SHA2 algorithms.
+      o Various DTLS fixes.
+
+  Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d [8 Feb 2011]:
+
+      o Fix for security issue CVE-2011-0014
+
+  Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c [2 Dec 2010]:
+
+      o Fix for security issue CVE-2010-4180
+      o Fix for CVE-2010-4252
+      o Fix mishandling of absent EC point format extension.
+      o Fix various platform compilation issues.
+      o Corrected fix for security issue CVE-2010-3864.
+
+  Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b [16 Nov 2010]:
+
+      o Fix for security issue CVE-2010-3864.
+      o Fix for CVE-2010-2939
+      o Fix WIN32 build system for GOST ENGINE.
+
+  Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a [1 Jun 2010]:
+
+      o Fix for security issue CVE-2010-1633.
+      o GOST MAC and CFB fixes.
+
+  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0 [29 Mar 2010]:
+
+      o RFC3280 path validation: sufficient to process PKITS tests.
+      o Integrated support for PVK files and keyblobs.
+      o Change default private key format to PKCS#8.
+      o CMS support: able to process all examples in RFC4134
+      o Streaming ASN1 encode support for PKCS#7 and CMS.
+      o Multiple signer and signer add support for PKCS#7 and CMS.
+      o ASN1 printing support.
+      o Whirlpool hash algorithm added.
+      o RFC3161 time stamp support.
+      o New generalised public key API supporting ENGINE based algorithms.
+      o New generalised public key API utilities.
+      o New ENGINE supporting GOST algorithms.
+      o SSL/TLS GOST ciphersuite support.
+      o PKCS#7 and CMS GOST support.
+      o RFC4279 PSK ciphersuite support.
+      o Supported points format extension for ECC ciphersuites.
+      o ecdsa-with-SHA224/256/384/512 signature types.
+      o dsa-with-SHA224 and dsa-with-SHA256 signature types.
+      o Opaque PRF Input TLS extension support.
+      o Updated time routines to avoid OS limitations.
+
+  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
+
+      o CFB cipher definition fixes.
+      o Fix security issues CVE-2010-0740 and CVE-2010-0433.
+
+  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m [25 Feb 2010]:
+
+      o Cipher definition fixes.
+      o Workaround for slow RAND_poll() on some WIN32 versions.
+      o Remove MD2 from algorithm tables.
+      o SPKAC handling fixes.
+      o Support for RFC5746 TLS renegotiation extension.
+      o Compression memory leak fixed.
+      o Compression session resumption fixed.
+      o Ticket and SNI coexistence fixes.
+      o Many fixes to DTLS handling.
+
+  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l [5 Nov 2009]:
+
+      o Temporary work around for CVE-2009-3555: disable renegotiation.
+
+  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k [25 Mar 2009]:
+
+      o Fix various build issues.
+      o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789)
+
+  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j [7 Jan 2009]:
+
+      o Fix security issue (CVE-2008-5077)
+      o Merge FIPS 140-2 branch code.
+
+  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h [28 May 2008]:
+
+      o CryptoAPI ENGINE support.
+      o Various precautionary measures.
+      o Fix for bugs affecting certificate request creation.
+      o Support for local machine keyset attribute in PKCS#12 files.
+
+  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g [19 Oct 2007]:
+
+      o Backport of CMS functionality to 0.9.8.
+      o Fixes for bugs introduced with 0.9.8f.
+
+  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f [11 Oct 2007]:
+
+      o Add gcc 4.2 support.
+      o Add support for AES and SSE2 assembly language optimization
+        for VC++ build.
+      o Support for RFC4507bis and server name extensions if explicitly
+        selected at compile time.
+      o DTLS improvements.
+      o RFC4507bis support.
+      o TLS Extensions support.
+
+  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e [23 Feb 2007]:
+
+      o Various ciphersuite selection fixes.
+      o RFC3779 support.
+
+  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d [28 Sep 2006]:
+
+      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
+      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
+      o Changes to ciphersuite selection algorithm
+
+  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c [5 Sep 2006]:
+
+      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
+      o New cipher Camellia
+
+  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b [4 May 2006]:
+
+      o Cipher string fixes.
+      o Fixes for VC++ 2005.
+      o Updated ECC cipher suite support.
+      o New functions EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free().
+      o Zlib compression usage fixes.
+      o Built in dynamic engine compilation support on Win32.
+      o Fixes auto dynamic engine loading in Win32.
+
+  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a [11 Oct 2005]:
+
+      o Fix potential SSL 2.0 rollback, CVE-2005-2969
+      o Extended Windows CE support
+
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8 [5 Jul 2005]:
+
+      o Major work on the BIGNUM library for higher efficiency and to
+        make operations more streamlined and less contradictory.  This
+        is the result of a major audit of the BIGNUM library.
+      o Addition of BIGNUM functions for fields GF(2^m) and NIST
+        curves, to support the Elliptic Crypto functions.
+      o Major work on Elliptic Crypto; ECDH and ECDSA added, including
+        the use through EVP, X509 and ENGINE.
+      o New ASN.1 mini-compiler that's usable through the OpenSSL
+        configuration file.
+      o Added support for ASN.1 indefinite length constructed encoding.
+      o New PKCS#12 'medium level' API to manipulate PKCS#12 files.
+      o Complete rework of shared library construction and linking
+        programs with shared or static libraries, through a separate
+        Makefile.shared.
+      o Rework of the passing of parameters from one Makefile to another.
+      o Changed ENGINE framework to load dynamic engine modules
+        automatically from specifically given directories.
+      o New structure and ASN.1 functions for CertificatePair.
+      o Changed the ZLIB compression method to be stateful.
+      o Changed the key-generation and primality testing "progress"
+        mechanism to take a structure that contains the ticker
+        function and an argument.
+      o New engine module: GMP (performs private key exponentiation).
+      o New engine module: VIA PadLOck ACE extension in VIA C3
+        Nehemiah processors.
+      o Added support for IPv6 addresses in certificate extensions.
+        See RFC 1884, section 2.2.
+      o Added support for certificate policy mappings, policy
+        constraints and name constraints.
+      o Added support for multi-valued AVAs in the OpenSSL
+        configuration file.
+      o Added support for multiple certificates with the same subject
+        in the 'openssl ca' index file.
+      o Make it possible to create self-signed certificates using
+        'openssl ca -selfsign'.
+      o Make it possible to generate a serial number file with
+        'openssl ca -create_serial'.
+      o New binary search functions with extended functionality.
+      o New BUF functions.
+      o New STORE structure and library to provide an interface to all
+        sorts of data repositories.  Supports storage of public and
+        private keys, certificates, CRLs, numbers and arbitrary blobs.
+        This library is unfortunately unfinished and unused within
+        OpenSSL.
+      o New control functions for the error stack.
+      o Changed the PKCS#7 library to support one-pass S/MIME
+        processing.
+      o Added the possibility to compile without old deprecated
+        functionality with the OPENSSL_NO_DEPRECATED macro or the
+        'no-deprecated' argument to the config and Configure scripts.
+      o Constification of all ASN.1 conversion functions, and other
+        affected functions.
+      o Improved platform support for PowerPC.
+      o New FIPS 180-2 algorithms (SHA-224, -256, -384 and -512).
+      o New X509_VERIFY_PARAM structure to support parameterisation
+        of X.509 path validation.
+      o Major overhaul of RC4 performance on Intel P4, IA-64 and
+        AMD64.
+      o Changed the Configure script to have some algorithms disabled
+        by default.  Those can be explicitly enabled with the new
+        argument form 'enable-xxx'.
+      o Change the default digest in 'openssl' commands from MD5 to
+        SHA-1.
+      o Added support for DTLS.
+      o New BIGNUM blinding.
+      o Added support for the RSA-PSS encryption scheme
+      o Added support for the RSA X.931 padding.
+      o Added support for BSD sockets on NetWare.
+      o Added support for files larger than 2GB.
+      o Added initial support for Win64.
+      o Added alternate pkg-config files.
+
+  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m [23 Feb 2007]:
+
+      o FIPS 1.1.1 module linking.
+      o Various ciphersuite selection fixes.
+
+  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l [28 Sep 2006]:
+
+      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
+      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
+
+  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k [5 Sep 2006]:
+
+      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
+
+  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j [4 May 2006]:
+
+      o Visual C++ 2005 fixes.
+      o Update Windows build system for FIPS.
+
+  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i [14 Oct 2005]:
+
+      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
+
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h [11 Oct 2005]:
+
+      o Fix SSL 2.0 Rollback, CVE-2005-2969
+      o Allow use of fixed-length exponent on DSA signing
+      o Default fixed-window RSA, DSA, DH private-key operations
+
+  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g [11 Apr 2005]:
+
+      o More compilation issues fixed.
+      o Adaptation to more modern Kerberos API.
+      o Enhanced or corrected configuration for Solaris64, Mingw and Cygwin.
+      o Enhanced x86_64 assembler BIGNUM module.
+      o More constification.
+      o Added processing of proxy certificates (RFC 3820).
+
+  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f [22 Mar 2005]:
+
+      o Several compilation issues fixed.
+      o Many memory allocation failure checks added.
+      o Improved comparison of X509 Name type.
+      o Mandatory basic checks on certificates.
+      o Performance improvements.
+
+  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e [25 Oct 2004]:
+
+      o Fix race condition in CRL checking code.
+      o Fixes to PKCS#7 (S/MIME) code.
+
+  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d [17 Mar 2004]:
+
+      o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
+      o Security: Fix null-pointer assignment in do_change_cipher_spec()
+      o Allow multiple active certificates with same subject in CA index
+      o Multiple X509 verification fixes
+      o Speed up HMAC and other operations
+
+  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c [30 Sep 2003]:
+
+      o Security: fix various ASN1 parsing bugs.
+      o New -ignore_err option to OCSP utility.
+      o Various interop and bug fixes in S/MIME code.
+      o SSL/TLS protocol fix for unrequested client certificates.
+
+  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b [10 Apr 2003]:
+
+      o Security: counter the Klima-Pokorny-Rosa extension of
+        Bleichbacher's attack
+      o Security: make RSA blinding default.
+      o Configuration: Irix fixes, AIX fixes, better mingw support.
+      o Support for new platforms: linux-ia64-ecc.
+      o Build: shared library support fixes.
+      o ASN.1: treat domainComponent correctly.
+      o Documentation: fixes and additions.
+
+  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a [19 Feb 2003]:
+
+      o Security: Important security related bugfixes.
+      o Enhanced compatibility with MIT Kerberos.
+      o Can be built without the ENGINE framework.
+      o IA32 assembler enhancements.
+      o Support for new platforms: FreeBSD/IA64 and FreeBSD/Sparc64.
+      o Configuration: the no-err option now works properly.
+      o SSL/TLS: now handles manual certificate chain building.
+      o SSL/TLS: certain session ID malfunctions corrected.
+
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7 [30 Dec 2002]:
+
+      o New library section OCSP.
+      o Complete rewrite of ASN1 code.
+      o CRL checking in verify code and openssl utility.
+      o Extension copying in 'ca' utility.
+      o Flexible display options in 'ca' utility.
+      o Provisional support for international characters with UTF8.
+      o Support for external crypto devices ('engine') is no longer
+        a separate distribution.
+      o New elliptic curve library section.
+      o New AES (Rijndael) library section.
+      o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit,
+        Linux x86_64, Linux 64-bit on Sparc v9
+      o Extended support for some platforms: VxWorks
+      o Enhanced support for shared libraries.
+      o Now only builds PIC code when shared library support is requested.
+      o Support for pkg-config.
+      o Lots of new manuals.
+      o Makes symbolic links to or copies of manuals to cover all described
+        functions.
+      o Change DES API to clean up the namespace (some applications link also
+        against libdes providing similar functions having the same name).
+        Provide macros for backward compatibility (will be removed in the
+        future).
+      o Unify handling of cryptographic algorithms (software and engine)
+        to be available via EVP routines for asymmetric and symmetric ciphers.
+      o NCONF: new configuration handling routines.
+      o Change API to use more 'const' modifiers to improve error checking
+        and help optimizers.
+      o Finally remove references to RSAref.
+      o Reworked parts of the BIGNUM code.
+      o Support for new engines: Broadcom ubsec, Accelerated Encryption
+        Processing, IBM 4758.
+      o A few new engines added in the demos area.
+      o Extended and corrected OID (object identifier) table.
+      o PRNG: query at more locations for a random device, automatic query for
+        EGD style random sources at several locations.
+      o SSL/TLS: allow optional cipher choice according to server's preference.
+      o SSL/TLS: allow server to explicitly set new session ids.
+      o SSL/TLS: support Kerberos cipher suites (RFC2712).
+        Only supports MIT Kerberos for now.
+      o SSL/TLS: allow more precise control of renegotiations and sessions.
+      o SSL/TLS: add callback to retrieve SSL/TLS messages.
+      o SSL/TLS: support AES cipher suites (RFC3268).
+
+  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k [30 Sep 2003]:
+
+      o Security: fix various ASN1 parsing bugs.
+      o SSL/TLS protocol fix for unrequested client certificates.
+
+  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j [10 Apr 2003]:
+
+      o Security: counter the Klima-Pokorny-Rosa extension of
+        Bleichbacher's attack
+      o Security: make RSA blinding default.
+      o Build: shared library support fixes.
+
+  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i [19 Feb 2003]:
+
+      o Important security related bugfixes.
+
+  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h [5 Dec 2002]:
+
+      o New configuration targets for Tandem OSS and A/UX.
+      o New OIDs for Microsoft attributes.
+      o Better handling of SSL session caching.
+      o Better comparison of distinguished names.
+      o Better handling of shared libraries in a mixed GNU/non-GNU environment.
+      o Support assembler code with Borland C.
+      o Fixes for length problems.
+      o Fixes for uninitialised variables.
+      o Fixes for memory leaks, some unusual crashes and some race conditions.
+      o Fixes for smaller building problems.
+      o Updates of manuals, FAQ and other instructive documents.
+
+  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g [9 Aug 2002]:
+
+      o Important building fixes on Unix.
+
+  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f [8 Aug 2002]:
+
+      o Various important bugfixes.
+
+  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e [30 Jul 2002]:
+
+      o Important security related bugfixes.
+      o Various SSL/TLS library bugfixes.
+
+  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d [9 May 2002]:
+
+      o Various SSL/TLS library bugfixes.
+      o Fix DH parameter generation for 'non-standard' generators.
+
+  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c [21 Dec 2001]:
+
+      o Various SSL/TLS library bugfixes.
+      o BIGNUM library fixes.
+      o RSA OAEP and random number generation fixes.
+      o Object identifiers corrected and added.
+      o Add assembler BN routines for IA64.
+      o Add support for OS/390 Unix, UnixWare with gcc, OpenUNIX 8,
+        MIPS Linux; shared library support for Irix, HP-UX.
+      o Add crypto accelerator support for AEP, Baltimore SureWare,
+        Broadcom and Cryptographic Appliance's keyserver
+        [in 0.9.6c-engine release].
+
+  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b [9 Jul 2001]:
+
+      o Security fix: PRNG improvements.
+      o Security fix: RSA OAEP check.
+      o Security fix: Reinsert and fix countermeasure to Bleichbacher's
+        attack.
+      o MIPS bug fix in BIGNUM.
+      o Bug fix in "openssl enc".
+      o Bug fix in X.509 printing routine.
+      o Bug fix in DSA verification routine and DSA S/MIME verification.
+      o Bug fix to make PRNG thread-safe.
+      o Bug fix in RAND_file_name().
+      o Bug fix in compatibility mode trust settings.
+      o Bug fix in blowfish EVP.
+      o Increase default size for BIO buffering filter.
+      o Compatibility fixes in some scripts.
+
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a [5 Apr 2001]:
+
+      o Security fix: change behavior of OpenSSL to avoid using
+        environment variables when running as root.
+      o Security fix: check the result of RSA-CRT to reduce the
+        possibility of deducing the private key from an incorrectly
+        calculated signature.
+      o Security fix: prevent Bleichenbacher's DSA attack.
+      o Security fix: Zero the premaster secret after deriving the
+        master secret in DH ciphersuites.
+      o Reimplement SSL_peek(), which had various problems.
+      o Compatibility fix: the function des_encrypt() renamed to
+        des_encrypt1() to avoid clashes with some Unixen libc.
+      o Bug fixes for Win32, HP/UX and Irix.
+      o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and
+        memory checking routines.
+      o Bug fixes for RSA operations in threaded environments.
+      o Bug fixes in misc. openssl applications.
+      o Remove a few potential memory leaks.
+      o Add tighter checks of BIGNUM routines.
+      o Shared library support has been reworked for generality.
+      o More documentation.
+      o New function BN_rand_range().
+      o Add "-rand" option to openssl s_client and s_server.
+
+  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6 [10 Oct 2000]:
+
+      o Some documentation for BIO and SSL libraries.
+      o Enhanced chain verification using key identifiers.
+      o New sign and verify options to 'dgst' application.
+      o Support for DER and PEM encoded messages in 'smime' application.
+      o New 'rsautl' application, low level RSA utility.
+      o MD4 now included.
+      o Bugfix for SSL rollback padding check.
+      o Support for external crypto devices [1].
+      o Enhanced EVP interface.
+
+    [1] The support for external crypto devices is currently a separate
+        distribution.  See the file README.ENGINE.
+
+  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a [1 Apr 2000]:
+
+      o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8
+      o Shared library support for HPUX and Solaris-gcc
+      o Support of Linux/IA64
+      o Assembler support for Mingw32
+      o New 'rand' application
+      o New way to check for existence of algorithms from scripts
+
+  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5 [25 May 2000]:
+
+      o S/MIME support in new 'smime' command
+      o Documentation for the OpenSSL command line application
+      o Automation of 'req' application
+      o Fixes to make s_client, s_server work under Windows
+      o Support for multiple fieldnames in SPKACs
+      o New SPKAC command line utility and associated library functions
+      o Options to allow passwords to be obtained from various sources
+      o New public key PEM format and options to handle it
+      o Many other fixes and enhancements to command line utilities
+      o Usable certificate chain verification
+      o Certificate purpose checking
+      o Certificate trust settings
+      o Support of authority information access extension
+      o Extensions in certificate requests
+      o Simplified X509 name and attribute routines
+      o Initial (incomplete) support for international character sets
+      o New DH_METHOD, DSA_METHOD and enhanced RSA_METHOD
+      o Read only memory BIOs and simplified creation function
+      o TLS/SSL protocol bugfixes: Accept TLS 'client hello' in SSL 3.0
+        record; allow fragmentation and interleaving of handshake and other
+        data
+      o TLS/SSL code now "tolerates" MS SGC
+      o Work around for Netscape client certificate hang bug
+      o RSA_NULL option that removes RSA patent code but keeps other
+        RSA functionality
+      o Memory leak detection now allows applications to add extra information
+        via a per-thread stack
+      o PRNG robustness improved
+      o EGD support
+      o BIGNUM library bug fixes
+      o Faster DSA parameter generation
+      o Enhanced support for Alpha Linux
+      o Experimental MacOS support
+
+  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4 [9 Aug 1999]:
+
+      o Transparent support for PKCS#8 format private keys: these are used
+        by several software packages and are more secure than the standard
+        form
+      o PKCS#5 v2.0 implementation
+      o Password callbacks have a new void * argument for application data
+      o Avoid various memory leaks
+      o New pipe-like BIO that allows using the SSL library when actual I/O
+        must be handled by the application (BIO pair)
+
+  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3 [24 May 1999]:
+      o Lots of enhancements and cleanups to the Configuration mechanism
+      o RSA OEAP related fixes
+      o Added `openssl ca -revoke' option for revoking a certificate
+      o Source cleanups: const correctness, type-safe stacks and ASN.1 SETs
+      o Source tree cleanups: removed lots of obsolete files
+      o Thawte SXNet, certificate policies and CRL distribution points
+        extension support
+      o Preliminary (experimental) S/MIME support
+      o Support for ASN.1 UTF8String and VisibleString
+      o Full integration of PKCS#12 code
+      o Sparc assembler bignum implementation, optimized hash functions
+      o Option to disable selected ciphers
+
+  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b [22 Mar 1999]:
+      o Fixed a security hole related to session resumption
+      o Fixed RSA encryption routines for the p < q case
+      o "ALL" in cipher lists now means "everything except NULL ciphers"
+      o Support for Triple-DES CBCM cipher
+      o Support of Optimal Asymmetric Encryption Padding (OAEP) for RSA
+      o First support for new TLSv1 ciphers
+      o Added a few new BIOs (syslog BIO, reliable BIO)
+      o Extended support for DSA certificate/keys.
+      o Extended support for Certificate Signing Requests (CSR)
+      o Initial support for X.509v3 extensions
+      o Extended support for compression inside the SSL record layer
+      o Overhauled Win32 builds
+      o Cleanups and fixes to the Big Number (BN) library
+      o Support for ASN.1 GeneralizedTime
+      o Splitted ASN.1 SETs from SEQUENCEs
+      o ASN1 and PEM support for Netscape Certificate Sequences
+      o Overhauled Perl interface
+      o Lots of source tree cleanups.
+      o Lots of memory leak fixes.
+      o Lots of bug fixes.
+
+  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c [23 Dec 1998]:
+      o Integration of the popular NO_RSA/NO_DSA patches
+      o Initial support for compression inside the SSL record layer
+      o Added BIO proxy and filtering functionality
+      o Extended Big Number (BN) library
+      o Added RIPE MD160 message digest
+      o Added support for RC2/64bit cipher
+      o Extended ASN.1 parser routines
+      o Adjustments of the source tree for CVS
+      o Support for various new platforms
+

Apache24/OPENSSL-README.txt

@@ -0,0 +1,127 @@
+
+ Apache HTTP Server 2.4 Limited OpenSSL Distribution
+
+ This binary installation of OpenSSL is a limited distribution of the
+ files derived from the OpenSSL project:
+
+   LICENSE.txt (includes openssl LICENSE)
+   OPENSSL-NEWS.txt
+   OPENSSL-README.txt
+   conf\openssl.cnf
+   bin\libeay32.dll
+   bin\ssleay32.dll
+   bin\openssl.exe
+
+ These are the minimal libraries and tools required to use mod_ssl as 
+ distributed with Apache HTTP Server version 2.4.  No library link files, 
+ headers or sources are distributed with this binary distribution.  Please 
+ refer to the <http://www.openssl.org/> site for complete source or binary 
+ distributions.
+
+ These OpenSSL binaries were built for distribution from the U.S. without 
+ support for the patented encryption methods IDEA, MDC-2 or RC5.
+
+ The Apache HTTP Project only supports the binary distribution of these files
+ and development of the mod_ssl module.  We cannot provide support assistance
+ for using or configuring the OpenSSL package or these modules.  Please refer
+ all installation and configuration questions to the appropriate forum,
+ such as the user supported lists, <http://httpd.apache.org/userslist.html> 
+ the Apache HTTP Server user's list or <http://www.openssl.org/support/> the
+ OpenSSL support page.
+
+--------------------------------------------------------------------------------
+
+
+ OpenSSL 1.1.1c 28 May 2019
+
+ Copyright (c) 1998-2019 The OpenSSL Project
+ Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
+ All rights reserved.
+
+ DESCRIPTION
+ -----------
+
+ The OpenSSL Project is a collaborative effort to develop a robust,
+ commercial-grade, fully featured, and Open Source toolkit implementing the
+ Transport Layer Security (TLS) protocols (including SSLv3) as well as a
+ full-strength general purpose cryptographic library.
+
+ OpenSSL is descended from the SSLeay library developed by Eric A. Young
+ and Tim J. Hudson.  The OpenSSL toolkit is licensed under a dual-license (the
+ OpenSSL license plus the SSLeay license), which means that you are free to
+ get and use it for commercial and non-commercial purposes as long as you
+ fulfill the conditions of both licenses.
+
+ OVERVIEW
+ --------
+
+ The OpenSSL toolkit includes:
+
+ libssl (with platform specific naming):
+     Provides the client and server-side implementations for SSLv3 and TLS.
+
+ libcrypto (with platform specific naming):
+     Provides general cryptographic and X.509 support needed by SSL/TLS but
+     not logically part of it.
+
+ openssl:
+     A command line tool that can be used for:
+        Creation of key parameters
+        Creation of X.509 certificates, CSRs and CRLs
+        Calculation of message digests
+        Encryption and decryption
+        SSL/TLS client and server tests
+        Handling of S/MIME signed or encrypted mail
+        And more...
+
+ INSTALLATION
+ ------------
+
+ See the appropriate file:
+        INSTALL         Linux, Unix, Windows, OpenVMS, ...
+        NOTES.*         INSTALL addendums for different platforms
+
+ SUPPORT
+ -------
+
+ See the OpenSSL website www.openssl.org for details on how to obtain
+ commercial technical support. Free community support is available through the
+ openssl-users email list (see
+ https://www.openssl.org/community/mailinglists.html for further details).
+
+ If you have any problems with OpenSSL then please take the following steps
+ first:
+
+    - Download the latest version from the repository
+      to see if the problem has already been addressed
+    - Configure with no-asm
+    - Remove compiler optimization flags
+
+ If you wish to report a bug then please include the following information
+ and create an issue on GitHub:
+
+    - OpenSSL version: output of 'openssl version -a'
+    - Configuration data: output of 'perl configdata.pm --dump'
+    - OS Name, Version, Hardware platform
+    - Compiler Details (name, version)
+    - Application Details (name, version)
+    - Problem Description (steps that will reproduce the problem, if known)
+    - Stack Traceback (if the application dumps core)
+
+ Just because something doesn't work the way you expect does not mean it
+ is necessarily a bug in OpenSSL. Use the openssl-users email list for this type
+ of query.
+
+ HOW TO CONTRIBUTE TO OpenSSL
+ ----------------------------
+
+ See CONTRIBUTING
+
+ LEGALITIES
+ ----------
+
+ A number of nations restrict the use or export of cryptography. If you
+ are potentially subject to such restrictions you should seek competent
+ professional legal advice before attempting to develop or distribute
+ cryptographic code.
+

Apache24/README.txt

@@ -0,0 +1,110 @@
+
+                          Apache HTTP Server
+
+  What is it?
+  -----------
+
+  The Apache HTTP Server is a powerful and flexible HTTP/1.1 compliant
+  web server.  Originally designed as a replacement for the NCSA HTTP
+  Server, it has grown to be the most popular web server on the
+  Internet.  As a project of the Apache Software Foundation, the
+  developers aim to collaboratively develop and maintain a robust,
+  commercial-grade, standards-based server with freely available
+  source code.
+
+  The Latest Version
+  ------------------
+
+  Details of the latest version can be found on the Apache HTTP
+  server project page under http://httpd.apache.org/.
+
+  Documentation
+  -------------
+
+  The documentation available as of the date of this release is
+  included in HTML format in the docs/manual/ directory.  The most
+  up-to-date documentation can be found at
+  http://httpd.apache.org/docs/2.4/.
+
+  Installation
+  ------------
+
+  Please see the file called INSTALL.  Platform specific notes can be
+  found in README.platforms.
+
+  Licensing
+  ---------
+
+  Please see the file called LICENSE.
+
+  Cryptographic Software Notice
+  -----------------------------
+
+  This distribution may include software that has been designed for use
+  with cryptographic software.  The country in which you currently reside
+  may have restrictions on the import, possession, use, and/or re-export
+  to another country, of encryption software.  BEFORE using any encryption
+  software, please check your country's laws, regulations and policies
+  concerning the import, possession, or use, and re-export of encryption
+  software, to see if this is permitted.  See <http://www.wassenaar.org/>
+  for more information.
+
+  The U.S. Government Department of Commerce, Bureau of Industry and
+  Security (BIS), has classified this software as Export Commodity 
+  Control Number (ECCN) 5D002.C.1, which includes information security
+  software using or performing cryptographic functions with asymmetric
+  algorithms.  The form and manner of this Apache Software Foundation
+  distribution makes it eligible for export under the License Exception
+  ENC Technology Software Unrestricted (TSU) exception (see the BIS 
+  Export Administration Regulations, Section 740.13) for both object 
+  code and source code.
+
+  The following provides more details on the included files that
+  may be subject to export controls on cryptographic software:
+
+    Apache httpd 2.0 and later versions include the mod_ssl module under
+       modules/ssl/
+    for configuring and listening to connections over SSL encrypted
+    network sockets by performing calls to a general-purpose encryption
+    library, such as OpenSSL or the operating system's platform-specific
+    SSL facilities.
+
+    In addition, some versions of apr-util provide an abstract interface
+    for symmetrical cryptographic functions that make use of a
+    general-purpose encryption library, such as OpenSSL, NSS, or the
+    operating system's platform-specific facilities. This interface is
+    known as the apr_crypto interface, with implementation beneath the
+    /crypto directory. The apr_crypto interface is used by the
+    mod_session_crypto module available under
+      modules/session
+    for optional encryption of session information.
+
+    Some object code distributions of Apache httpd, indicated with the
+    word "crypto" in the package name, may include object code for the
+    OpenSSL encryption library as distributed in open source form from
+    <http://www.openssl.org/source/>.
+
+  The above files are optional and may be removed if the cryptographic
+  functionality is not desired or needs to be excluded from redistribution.
+  Distribution packages of Apache httpd that include the word "nossl"
+  in the package name have been created without the above files and are
+  therefore not subject to this notice.
+
+  Contacts
+  --------
+
+     o If you want to be informed about new code releases, bug fixes,
+       security fixes, general news and information about the Apache server
+       subscribe to the apache-announce mailing list as described under
+       <http://httpd.apache.org/lists.html#http-announce>
+
+     o If you want freely available support for running Apache please see the
+       resources at <http://httpd.apache.org/support.html>
+
+     o If you have a concrete bug report for Apache please see the instructions
+       for bug reporting at <http://httpd.apache.org/bug_report.html>
+
+     o If you want to participate in actively developing Apache please
+       subscribe to the `dev@httpd.apache.org' mailing list as described at
+       <http://httpd.apache.org/lists.html#http-dev>
+

Apache24/bin/dbmmanage.pl

@@ -0,0 +1,311 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#for more functionality see the HTTPD::UserAdmin module:
+# http://www.perl.com/CPAN/modules/by-module/HTTPD/HTTPD-Tools-x.xx.tar.gz
+#
+# usage: dbmmanage <DBMfile> <command> <user> <password> <groups> <comment>
+
+package dbmmanage;
+#                               -ldb    -lndbm    -lgdbm    -lsdbm
+BEGIN { @AnyDBM_File::ISA = qw(SDBM_File) }
+use strict;
+use Fcntl;
+use AnyDBM_File ();
+
+sub usage {
+    my $cmds = join "|", sort keys %dbmc::;
+    die <<SYNTAX;
+Usage: dbmmanage [enc] dbname command [username [pw [group[,group] [comment]]]]
+
+    where enc is  -d for crypt encryption (default except on Win32, Netware)
+                  -m for MD5 encryption (default on Win32, Netware)
+                  -s for SHA1 encryption
+                  -p for plaintext
+
+    command is one of: $cmds
+
+    pw of . for update command retains the old password
+    pw of - (or blank) for update command prompts for the password
+
+    groups or comment of . (or blank) for update command retains old values
+    groups or comment of - for update command clears the existing value
+    groups or comment of - for add and adduser commands is the empty value
+SYNTAX
+}
+
+sub need_sha1_crypt {
+    if (!eval ('require "Digest/SHA1.pm";')) {
+        print STDERR <<SHAERR;
+dbmmanage SHA1 passwords require the interface or the module Digest::SHA1
+available from CPAN:
+
+    http://www.cpan.org/modules/by-module/Digest/Digest-MD5-2.12.tar.gz
+
+Please install Digest::SHA1 and try again, or use a different crypt option:
+
+SHAERR
+        usage();
+    }
+}
+
+sub need_md5_crypt {
+    if (!eval ('require "Crypt/PasswdMD5.pm";')) {
+        print STDERR <<MD5ERR;
+dbmmanage MD5 passwords require the module Crypt::PasswdMD5 available from CPAN
+
+    http://www.cpan.org/modules/by-module/Crypt/Crypt-PasswdMD5-1.1.tar.gz
+
+Please install Crypt::PasswdMD5 and try again, or use a different crypt option:
+
+MD5ERR
+        usage();
+    }
+}
+
+# if your osname is in $newstyle_salt, then use new style salt (starts with '_' and contains
+# four bytes of iteration count and four bytes of salt).  Otherwise, just use
+# the traditional two-byte salt.
+# see the man page on your system to decide if you have a newer crypt() lib.
+# I believe that 4.4BSD derived systems do (at least BSD/OS 2.0 does).
+# The new style crypt() allows up to 20 characters of the password to be
+# significant rather than only 8.
+#
+my $newstyle_salt_platforms = join '|', qw{bsdos}; #others?
+my $newstyle_salt = $^O =~ /(?:$newstyle_salt_platforms)/;
+
+# Some platforms just can't crypt() for Apache
+#
+my $crypt_not_supported_platforms = join '|', qw{MSWin32 NetWare}; #others?
+my $crypt_not_supported = $^O =~ /(?:$crypt_not_supported_platforms)/;
+
+my $crypt_method = "crypt";
+
+if ($crypt_not_supported) {
+    $crypt_method = "md5";
+}
+
+# Some platforms won't jump through our favorite hoops
+#
+my $not_unix_platforms = join '|', qw{MSWin32 NetWare}; #others?
+my $not_unix = $^O =~ /(?:$not_unix_platforms)/;
+
+if ($crypt_not_supported) {
+    $crypt_method = "md5";
+}
+
+if (@ARGV[0] eq "-d") {
+    shift @ARGV;
+    if ($crypt_not_supported) {
+        print STDERR
+              "Warning: Apache/$^O does not support crypt()ed passwords!\n\n";
+    }
+    $crypt_method = "crypt";
+}
+
+if (@ARGV[0] eq "-m") {
+    shift @ARGV;
+    $crypt_method = "md5";
+}
+
+if (@ARGV[0] eq "-p") {
+    shift @ARGV;
+    if (!$crypt_not_supported) {
+        print STDERR
+              "Warning: Apache/$^O does not support plaintext passwords!\n\n";
+    }
+    $crypt_method = "plain";
+}
+
+if (@ARGV[0] eq "-s") {
+    shift @ARGV;
+    need_sha1_crypt();
+    $crypt_method = "sha1";
+}
+
+if ($crypt_method eq "md5") {
+    need_md5_crypt();
+}
+
+my($file,$command,$key,$crypted_pwd,$groups,$comment) = @ARGV;
+
+usage() unless $file and $command and defined &{$dbmc::{$command}};
+
+# remove extension if any
+my $chop = join '|', qw{db.? pag dir};
+$file =~ s/\.($chop)$//;
+
+my $is_update = $command eq "update";
+my %DB = ();
+my @range = ();
+my($mode, $flags) = $command =~
+    /^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT);
+
+tie (%DB, "AnyDBM_File", $file, $flags, $mode) || die "Can't tie $file: $!";
+dbmc->$command();
+untie %DB;
+
+
+my $x;
+sub genseed {
+    my $psf;
+    if ($not_unix) {
+        srand (time ^ $$ or time ^ ($$ + ($$ << 15)));
+    }
+    else {
+        for (qw(-xlwwa -le)) {
+            `ps $_ 2>/dev/null`;
+            $psf = $_, last unless $?;
+        }
+        srand (time ^ $$ ^ unpack("%L*", `ps $psf | gzip -f`));
+    }
+    @range = (qw(. /), '0'..'9','a'..'z','A'..'Z');
+    $x = int scalar @range;
+}
+
+sub randchar {
+    join '', map $range[rand $x], 1..shift||1;
+}
+
+sub saltpw_crypt {
+    genseed() unless @range;
+    return $newstyle_salt ?
+        join '', "_", randchar, "a..", randchar(4) :
+        randchar(2);
+}
+
+sub cryptpw_crypt {
+    my ($pw, $salt) = @_;
+    $salt = saltpw_crypt unless $salt;
+    crypt $pw, $salt;
+}
+
+sub saltpw_md5 {
+    genseed() unless @range;
+    randchar(8);
+}
+
+sub cryptpw_md5 {
+    my($pw, $salt) = @_;
+    $salt = saltpw_md5 unless $salt;
+    Crypt::PasswdMD5::apache_md5_crypt($pw, $salt);
+}
+
+sub cryptpw_sha1 {
+    my($pw, $salt) = @_;
+    '{SHA}' . Digest::SHA1::sha1_base64($pw) . "=";
+}
+
+sub cryptpw {
+    if ($crypt_method eq "md5") {
+        return cryptpw_md5(@_);
+    } elsif ($crypt_method eq "sha1") {
+        return cryptpw_sha1(@_);
+    } elsif ($crypt_method eq "crypt") {
+        return cryptpw_crypt(@_);
+    }
+    @_[0]; # otherwise return plaintext
+}
+
+sub getpass {
+    my $prompt = shift || "Enter password:";
+
+    unless($not_unix) {
+        open STDIN, "/dev/tty" or warn "couldn't open /dev/tty $!\n";
+        system "stty -echo;";
+    }
+
+    my($c,$pwd);
+    print STDERR $prompt;
+    while (($c = getc(STDIN)) ne '' and $c ne "\n" and $c ne "\r") {
+        $pwd .= $c;
+    }
+
+    system "stty echo" unless $not_unix;
+    print STDERR "\n";
+    die "Can't use empty password!\n" unless length $pwd;
+    return $pwd;
+}
+
+sub dbmc::update {
+    die "Sorry, user `$key' doesn't exist!\n" unless $DB{$key};
+    $crypted_pwd = (split /:/, $DB{$key}, 3)[0] if $crypted_pwd eq '.';
+    $groups = (split /:/, $DB{$key}, 3)[1] if !$groups || $groups eq '.';
+    $comment = (split /:/, $DB{$key}, 3)[2] if !$comment || $comment eq '.';
+    if (!$crypted_pwd || $crypted_pwd eq '-') {
+        dbmc->adduser;
+    }
+    else {
+        dbmc->add;
+    }
+}
+
+sub dbmc::add {
+    die "Can't use empty password!\n" unless $crypted_pwd;
+    unless($is_update) {
+        die "Sorry, user `$key' already exists!\n" if $DB{$key};
+    }
+    $groups = '' if $groups eq '-';
+    $comment = '' if $comment eq '-';
+    $groups .= ":" . $comment if $comment;
+    $crypted_pwd .= ":" . $groups if $groups;
+    $DB{$key} = $crypted_pwd;
+    my $action = $is_update ? "updated" : "added";
+    print "User $key $action with password encrypted to $DB{$key} using $crypt_method\n";
+}
+
+sub dbmc::adduser {
+    my $value = getpass "New password:";
+    die "They don't match, sorry.\n" unless getpass("Re-type new password:") eq $value;
+    $crypted_pwd = cryptpw $value;
+    dbmc->add;
+}
+
+sub dbmc::delete {
+    die "Sorry, user `$key' doesn't exist!\n" unless $DB{$key};
+    delete $DB{$key}, print "`$key' deleted\n";
+}
+
+sub dbmc::view {
+    print $key ? "$key:$DB{$key}\n" : map { "$_:$DB{$_}\n" if $DB{$_} } keys %DB;
+}
+
+sub dbmc::check {
+    die "Sorry, user `$key' doesn't exist!\n" unless $DB{$key};
+    my $chkpass = (split /:/, $DB{$key}, 3)[0];
+    my $testpass = getpass();
+    if (substr($chkpass, 0, 6) eq '$apr1$') {
+        need_md5_crypt;
+        $crypt_method = "md5";
+    } elsif (substr($chkpass, 0, 5) eq '{SHA}') {
+        need_sha1_crypt;
+        $crypt_method = "sha1";
+    } elsif (length($chkpass) == 13 && $chkpass ne $testpass) {
+        $crypt_method = "crypt";
+    } else {
+        $crypt_method = "plain";
+    }
+    print $crypt_method . (cryptpw($testpass, $chkpass) eq $chkpass
+                           ? " password ok\n" : " password mismatch\n");
+}
+
+sub dbmc::import {
+    while(defined($_ = <STDIN>) and chomp) {
+        ($key,$crypted_pwd,$groups,$comment) = split /:/, $_, 4;
+        dbmc->add;
+    }
+}
+